Changeset 8d182b1 for src/CodeGen/CodeGeneratorNew.hpp

Timestamp:

Nov 14, 2023, 12:19:09 PM (23 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

1ccae59, 89a8bab

Parents:

df8ba61a (diff), 5625427 (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

File:

• src/CodeGen/CodeGeneratorNew.hpp (modified) (3 diffs)

src/CodeGen/CodeGeneratorNew.hpp

@@ -25 +25 @@
 namespace CodeGen {
 
-#warning Remove the _new when old version is removed.
-struct CodeGenerator_new :
+struct CodeGenerator final :
                 public ast::WithGuards,
                 public ast::WithShortCircuiting,
-                public ast::WithVisitorRef<CodeGenerator_new> {
-        CodeGenerator_new( std::ostream & out, Options const & options );
+                public ast::WithVisitorRef<CodeGenerator> {
+        CodeGenerator( std::ostream & out, Options const & options );
 
         // Turn off visit_children for all nodes.
@@ -119 +118 @@
         /// Custom local implementation of endl that updates print location.
         struct LineEnder {
-                CodeGenerator_new & cg;
-                LineEnder( CodeGenerator_new & cg ) : cg( cg ) {}
+                CodeGenerator & cg;
+                LineEnder( CodeGenerator & cg ) : cg( cg ) {}
                 std::ostream & operator()( std::ostream & ) const;
         };
@@ -129 +128 @@
         /// Wrapper class to help print vectors of Labels.
         struct LabelPrinter {
-                LabelPrinter( CodeGenerator_new & cg ) : cg( cg ), labels( nullptr ) {}
+                LabelPrinter( CodeGenerator & cg ) : cg( cg ), labels( nullptr ) {}
                 LabelPrinter & operator()( std::vector<ast::Label> const & l );
                 std::ostream & operator()( std::ostream & ) const;
-                CodeGenerator_new & cg;
+                CodeGenerator & cg;
                 std::vector<ast::Label> const * labels;
         };