Changeset 4dc3b8c for src/GenPoly

Timestamp:

Nov 30, 2023, 6:14:20 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

2f8d351

Parents:

7f2bfb7 (diff), c4570af3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/GenPoly

Files:

• Box.cpp (moved) (moved from src/GenPoly/BoxNew.cpp ) (2 diffs)
• FindFunction.cc (modified) (1 diff)
• InstantiateGeneric.cpp (moved) (moved from src/GenPoly/InstantiateGenericNew.cpp ) (2 diffs)
• Lvalue.cpp (moved) (moved from src/GenPoly/LvalueNew.cpp ) (1 diff)
• ScrubTypeVars.cpp (moved) (moved from src/GenPoly/ScrubTyVars.cc ) (3 diffs)
• ScrubTypeVars.hpp (moved) (moved from src/GenPoly/ScrubTyVars.h ) (1 diff)
• Specialize.cpp (moved) (moved from src/GenPoly/SpecializeNew.cpp ) (1 diff)
• module.mk (modified) (1 diff)

src/GenPoly/Box.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// BoxNew.cpp -- Implement polymorphic function calls and types.
+// Box.cpp -- Implement polymorphic function calls and types.
 //
 // Author           : Andrew Beach
@@ -32 +32 @@
 #include "GenPoly/Lvalue.h"            // for generalizedLvalue
 #include "GenPoly/ScopedSet.h"         // for ScopedSet
-#include "GenPoly/ScrubTyVars.h"       // for scrubTypeVars, scrubAllTypeVars
+#include "GenPoly/ScrubTypeVars.hpp"   // for scrubTypeVars, scrubAllTypeVars
 #include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "SymTab/Mangler.h"            // for mangle, mangleType

src/GenPoly/FindFunction.cc

@@ -22 +22 @@
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::iterator
 #include "GenPoly/GenPoly.h"            // for TyVarMap
-#include "ScrubTyVars.h"                // for ScrubTyVars
+#include "ScrubTypeVars.hpp"            // for scrubTypeVars
 
 namespace GenPoly {

src/GenPoly/InstantiateGeneric.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InstantiateGenericNew.cpp -- Create concrete instances of generic types.
+// InstantiateGeneric.cpp -- Create concrete instances of generic types.
 //
 // Author           : Andrew Beach
@@ -31 +31 @@
 #include "Common/UniqueName.h"         // for UniqueName
 #include "GenPoly/GenPoly.h"           // for isPolyType, typesPolyCompatible
-#include "GenPoly/ScrubTyVars.h"       // for scrubAll
+#include "GenPoly/ScrubTypeVars.hpp"   // for scrubAllTypeVars
 #include "ResolvExpr/AdjustExprType.hpp"  // for adjustExprType
 #include "ResolvExpr/Unify.h"          // for typesCompatible

src/GenPoly/Lvalue.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// LvalueNew.cpp -- Clean up lvalues and remove references.
+// Lvalue.cpp -- Clean up lvalues and remove references.
 //
 // Author           : Andrew Beach

src/GenPoly/ScrubTypeVars.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScrubTyVars.cc -- Remove polymorphic types.
+// ScrubTypeVars.cpp -- Remove polymorphic types.
 //
 // Author           : Richard C. Bilson
@@ -14 +14 @@
 //
 
+#include "ScrubTypeVars.hpp"
+
 #include <utility>                      // for pair
 
@@ -19 +21 @@
 #include "GenPoly.h"                    // for mangleType, TyVarMap, alignof...
 #include "GenPoly/ErasableScopedMap.h"  // for ErasableScopedMap<>::const_it...
-#include "ScrubTyVars.h"
 #include "SymTab/Mangler.h"             // for mangleType
 

src/GenPoly/ScrubTypeVars.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ScrubTyVars.h -- Remove polymorphic types.
+// ScrubTypeVars.hpp -- Remove polymorphic types.
 //
 // Author           : Richard C. Bilson

src/GenPoly/Specialize.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SpecializeNew.cpp -- Generate thunks to specialize polymorphic functions.
+// Specialize.cpp -- Generate thunks to specialize polymorphic functions.
 //
 // Author           : Andrew Beach

src/GenPoly/module.mk

@@ -22 +22 @@
 
 SRC += $(SRC_GENPOLY) \
-        GenPoly/BoxNew.cpp \
+        GenPoly/Box.cpp \
         GenPoly/Box.h \
         GenPoly/ErasableScopedMap.h \
         GenPoly/FindFunction.cc \
         GenPoly/FindFunction.h \
-        GenPoly/InstantiateGenericNew.cpp \
+        GenPoly/InstantiateGeneric.cpp \
         GenPoly/InstantiateGeneric.h \
-        GenPoly/LvalueNew.cpp \
+        GenPoly/Lvalue.cpp \
         GenPoly/ScopedSet.h \
-        GenPoly/ScrubTyVars.cc \
-        GenPoly/ScrubTyVars.h \
-        GenPoly/SpecializeNew.cpp \
+        GenPoly/ScrubTypeVars.cpp \
+        GenPoly/ScrubTypeVars.hpp \
+        GenPoly/Specialize.cpp \
         GenPoly/Specialize.h