Changeset bf4fe05 for src/Tuples

Timestamp:

May 13, 2024, 7:07:06 AM (8 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

ca4f2b2

Parents:

ec20ab9 (diff), 5f225f5 (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:

fix merge

Location:

src/Tuples

Files:

• Explode.cpp (moved) (moved from src/Tuples/Explode.cc) (2 diffs)
• Explode.hpp (moved) (moved from src/Tuples/Explode.h) (2 diffs)
• TupleAssignment.cpp (moved) (moved from src/Tuples/TupleAssignment.cc) (3 diffs)
• TupleExpansion.cpp (modified) (1 diff)
• Tuples.cpp (moved) (moved from src/Tuples/Tuples.cc) (2 diffs)
• Tuples.hpp (moved) (moved from src/Tuples/Tuples.h) (2 diffs)
• module.mk (modified) (1 diff)

src/Tuples/Explode.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Explode.cc --
+// Explode.cpp --
 //
 // Author           : Rob Schluntz
@@ -14 +14 @@
 //
 
-#include "Explode.h"
+#include "Explode.hpp"
 
 #include "AST/Pass.hpp"          // for Pass

src/Tuples/Explode.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Explode.h --
+// Explode.hpp --
 //
 // Author           : Rob Schluntz
@@ -22 +22 @@
 #include "ResolvExpr/Candidate.hpp"     // for Candidate, CandidateList
 #include "ResolvExpr/ExplodedArg.hpp"   // for ExplodedArg
-#include "Tuples.h"                     // for maybeImpure
+#include "Tuples.hpp"                   // for maybeImpure
 
 namespace ast {

src/Tuples/TupleAssignment.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TupleAssignment.cc --
+// TupleAssignment.cpp --
 //
 // Author           : Rodolfo G. Esteves
@@ -14 +14 @@
 //
 
-#include "Tuples.h"
+#include "Tuples.hpp"
 
 #include <algorithm>                       // for transform
@@ -29 +29 @@
 #include "AST/Stmt.hpp"
 #include "AST/TypeEnvironment.hpp"
-#include "CodeGen/OperatorTable.h"
-#include "Common/UniqueName.h"             // for UniqueName
-#include "Common/utility.h"                // for splice, zipWith
-#include "Explode.h"                       // for explode
-#include "InitTweak/GenInit.h"             // for genCtorInit
-#include "InitTweak/InitTweak.h"           // for getPointerBase, isAssignment
+#include "CodeGen/OperatorTable.hpp"
+#include "Common/UniqueName.hpp"           // for UniqueName
+#include "Common/Utility.hpp"              // for splice, zipWith
+#include "Explode.hpp"                     // for explode
+#include "InitTweak/GenInit.hpp"           // for genCtorInit
+#include "InitTweak/InitTweak.hpp"         // for getPointerBase, isAssignment
 #include "ResolvExpr/CandidateFinder.hpp"  // for CandidateFinder
-#include "ResolvExpr/Cost.h"               // for Cost
-#include "ResolvExpr/Resolver.h"           // for resolveCtorInit
-#include "ResolvExpr/typeops.h"            // for combos
+#include "ResolvExpr/Cost.hpp"             // for Cost
+#include "ResolvExpr/Resolver.hpp"         // for resolveCtorInit
+#include "ResolvExpr/Typeops.hpp"          // for combos
 
 #if 0

src/Tuples/TupleExpansion.cpp

@@ -14 +14 @@
 //
 
-#include "Tuples.h"
+#include "Tuples.hpp"
 
 #include "AST/Pass.hpp"
-#include "Common/ScopedMap.h"
+#include "Common/ScopedMap.hpp"
 
 namespace Tuples {

src/Tuples/Tuples.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Tuples.cc -- A collection of tuple operations.
+// Tuples.cpp -- A collection of tuple operations.
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
-#include "Tuples.h"
+#include "Tuples.hpp"
 
 #include "AST/Pass.hpp"
 #include "AST/Inspect.hpp"
 #include "AST/LinkageSpec.hpp"
-#include "InitTweak/InitTweak.h"
+#include "InitTweak/InitTweak.hpp"
 
 namespace Tuples {

src/Tuples/Tuples.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Tuples.h -- A collection of tuple operations.
+// Tuples.hpp -- A collection of tuple operations.
 //
 // Author           : Rodolfo G. Esteves
@@ -27 +27 @@
 namespace Tuples {
 
-// TupleAssignment.cc
+// TupleAssignment.cpp
 void handleTupleAssignment(
         ResolvExpr::CandidateFinder & finder, const ast::UntypedExpr * assign,
         std::vector< ResolvExpr::CandidateFinder > & args );
 
-// TupleExpansion.cc
+// TupleExpansion.cpp
 /// Expands z.[a, b.[x, y], c] into [z.a, z.b.x, z.b.y, z.c], inserting UniqueExprs as appropriate.
 void expandMemberTuples( ast::TranslationUnit & translationUnit );

src/Tuples/module.mk

@@ -16 +16 @@
 
 SRC_TUPLES = \
-        Tuples/Explode.cc \
-        Tuples/Explode.h \
-        Tuples/TupleAssignment.cc \
+        Tuples/Explode.cpp \
+        Tuples/Explode.hpp \
+        Tuples/TupleAssignment.cpp \
         Tuples/TupleExpansion.cpp \
-        Tuples/Tuples.cc \
-        Tuples/Tuples.h
+        Tuples/Tuples.cpp \
+        Tuples/Tuples.hpp
 
 SRC += $(SRC_TUPLES)