Changeset 81da3da4 for src/CodeGen

Timestamp:

Dec 11, 2023, 4:18:13 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (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/CodeGen

Files:

• CodeGenerator.cpp (moved) (moved from src/CodeGen/CodeGeneratorNew.cpp ) (2 diffs)
• CodeGenerator.hpp (moved) (moved from src/CodeGen/CodeGeneratorNew.hpp ) (1 diff)
• GenType.cc (modified) (1 diff)
• GenType.h (modified) (2 diffs)
• Generate.cc (modified) (1 diff)
• module.mk (modified) (1 diff)

src/CodeGen/CodeGenerator.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGeneratorNew.cpp --
+// CodeGenerator.cpp --
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
-#include "CodeGeneratorNew.hpp"
+#include "CodeGenerator.hpp"
 
 #include "AST/Print.hpp"

src/CodeGen/CodeGenerator.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGeneratorNew.hpp --
+// CodeGenerator.hpp --
 //
 // Author           : Andrew Beach

src/CodeGen/GenType.cc

@@ -21 +21 @@
 #include "AST/Print.hpp"          // for print
 #include "AST/Vector.hpp"         // for vector
-#include "CodeGeneratorNew.hpp"   // for CodeGenerator
+#include "CodeGenerator.hpp"      // for CodeGenerator
 #include "Common/UniqueName.h"    // for UniqueName
 

src/CodeGen/GenType.h

@@ -20 +20 @@
 #include "CodeGen/Options.h" // for Options
 
-class Type;
 namespace ast {
         class Type;
@@ -26 +25 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString, const Options &options );
-        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
-        std::string genPrettyType( Type * type, const std::string & baseString );
 
 std::string genType( ast::Type const * type, const std::string & base, const Options & options );

src/CodeGen/Generate.cc

@@ -19 +19 @@
 #include <string>                    // for operator<<
 
-#include "CodeGeneratorNew.hpp"      // for CodeGenerator, doSemicolon, ...
+#include "CodeGenerator.hpp"         // for CodeGenerator, doSemicolon, ...
 #include "GenType.h"                 // for genPrettyType
 

src/CodeGen/module.mk

@@ -16 +16 @@
 
 SRC_CODEGEN = \
-        CodeGen/CodeGeneratorNew.cpp \
-        CodeGen/CodeGeneratorNew.hpp \
+        CodeGen/CodeGenerator.cpp \
+        CodeGen/CodeGenerator.hpp \
         CodeGen/GenType.cc \
         CodeGen/GenType.h \