Changeset ffec1bf for src/CodeGen/CodeGenerator.cc

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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/CodeGenerator.cc (modified) (5 diffs)

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
@@ -294 +295 @@
                                 } else {
                                         if ( obj->get_init() ) {
-                                                obj->get_init()->accept( *visitor ); 
+                                                obj->get_init()->accept( *visitor );
                                         } else {
                                                 // Should not reach here!
@@ -683 +684 @@
                 extension( variableExpr );
                 const OperatorInfo * opInfo;
-                if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
+                if( dynamic_cast<ZeroType*>( variableExpr->get_var()->get_type() ) ) {
+                        output << "0";
+                } else if ( variableExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && (opInfo = operatorLookup( variableExpr->get_var()->get_name() )) && opInfo->type == OT_CONSTANT ) {
                         output << opInfo->symbol;
                 } else {
-                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type()) 
+                        // if (dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())
                         // && dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base) {
                         //      output << '(' <<genType(dynamic_cast<EnumInstType *>(variableExpr->get_var()->get_type())->baseEnum->base, "", options) << ')';
@@ -1236 +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