Changeset d4b37ab for src/CodeGen

Timestamp:

Jul 13, 2022, 11:16:56 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

af75a87, d958834b

Parents:

25404c7 (diff), b9f8274 (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.cc (modified) (3 diffs)
• CodeGenerator.h (modified) (3 diffs)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 20:30:30 2022
-// Update Count     : 541
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:34:00 2022
+// Update Count     : 542
 //
 #include "CodeGenerator.h"
@@ -18 +18 @@
 #include <list>                      // for _List_iterator, list, list<>::it...
 
+#include "AST/Decl.hpp"              // for DeclWithType
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
@@ -1238 +1239 @@
                 } // if
         }
+
+std::string genName( ast::DeclWithType const * decl ) {
+        if ( const OperatorInfo * opInfo = operatorLookup( decl->name ) ) {
+                return opInfo->outputName;
+        } else {
+                return decl->name;
+        }
+}
+
 } // namespace CodeGen
 

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  1 09:23:21 2022
-// Update Count     : 64
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 29 14:32:00 2022
+// Update Count     : 65
 //
 
@@ -26 +26 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+namespace ast {
+        class DeclWithType;
+}
 
 namespace CodeGen {
@@ -182 +186 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+        std::string genName( ast::DeclWithType const * decl );
 
         inline std::ostream & operator<<( std::ostream & os, const CodeGenerator::LineEnder & endl ) {

src/CodeGen/GenType.cc

@@ -254 +254 @@
 
         void GenType::postvisit( EnumInstType * enumInst ) {
-                if ( enumInst->baseEnum->base ) {
+                if ( enumInst->baseEnum && enumInst->baseEnum->base ) {
                         typeString = genType(enumInst->baseEnum->base, "", options) + typeString;
                 } else {