Changeset 42a36d9 for src/CodeGen/GenType.cc

Timestamp:

May 1, 2019, 3:32:10 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5157ba7

Parents:

3908e5d

Message:

Created CodeGen::Options which hold some flags for code generation.

File:

• src/CodeGen/GenType.cc (modified) (19 diffs)

src/CodeGen/GenType.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 : Fri Mar 17 09:02:28 2017
-// Update Count     : 22
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May  1 15:24:00 2019
+// Update Count     : 23
 //
 #include "GenType.h"
@@ -28 +28 @@
         struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
                 std::string typeString;
-                GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks );
+                GenType( const std::string &typeString, const Options &options );
 
                 void previsit( BaseSyntaxNode * );
@@ -57 +57 @@
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
 
-                bool pretty = false;    // pretty print
-                bool genC = false;      // generating C code?
-                bool lineMarks = false; // lineMarks on for CodeGenerator?
+                Options options;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
-                PassVisitor<GenType> gt( baseString, pretty, genC, lineMarks );
+        std::string genType( Type *type, const std::string &baseString, const Options &options ) {
+                PassVisitor<GenType> gt( baseString, options );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         cg.pass.genAttributes( type->get_attributes() );
                 } // if
@@ -75 +73 @@
         }
 
-  std::string genPrettyType( Type * type, const std::string & baseString ) {
-        return genType( type, baseString, true, false );
-  }
-
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                return genType( type, baseString, Options(pretty, genC, lineMarks, false ) );
+        }
+
+        std::string genPrettyType( Type * type, const std::string & baseString ) {
+                return genType( type, baseString, true, false );
+        }
+
+        GenType::GenType( const std::string &typeString, const Options &options ) : typeString( typeString ), options( options ) {}
 
         // *** BaseSyntaxNode
@@ -133 +135 @@
                 } // if
                 if ( dimension != 0 ) {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -167 +169 @@
         void GenType::postvisit( ReferenceType * refType ) {
                 assert( refType->base != 0);
-                assertf( ! genC, "Reference types should not reach code generation." );
+                assertf( ! options.genC, "Reference types should not reach code generation." );
                 handleQualifiers( refType );
                 typeString = "&" + typeString;
@@ -195 +197 @@
                         } // if
                 } else {
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(" ;
 
@@ -215 +217 @@
 
                 // add forall
-                if( ! funcType->forall.empty() && ! genC ) {
+                if( ! funcType->forall.empty() && ! options.genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "forall(";
                         cg.pass.genCommaList( funcType->forall.begin(), funcType->forall.end() );
@@ -229 +231 @@
                 if ( ! refType->parameters.empty() ) {
                         std::ostringstream os;
-                        PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                        PassVisitor<CodeGenerator> cg( os, options );
                         os << "(";
                         cg.pass.genCommaList( refType->parameters.begin(), refType->parameters.end() );
@@ -240 +242 @@
         void GenType::postvisit( StructInstType * structInst )  {
                 typeString = structInst->name + handleGeneric( structInst ) + " " + typeString;
-                if ( genC ) typeString = "struct " + typeString;
+                if ( options.genC ) typeString = "struct " + typeString;
                 handleQualifiers( structInst );
         }
@@ -246 +248 @@
         void GenType::postvisit( UnionInstType * unionInst ) {
                 typeString = unionInst->name + handleGeneric( unionInst ) + " " + typeString;
-                if ( genC ) typeString = "union " + typeString;
+                if ( options.genC ) typeString = "union " + typeString;
                 handleQualifiers( unionInst );
         }
@@ -252 +254 @@
         void GenType::postvisit( EnumInstType * enumInst ) {
                 typeString = enumInst->name + " " + typeString;
-                if ( genC ) typeString = "enum " + typeString;
+                if ( options.genC ) typeString = "enum " + typeString;
                 handleQualifiers( enumInst );
         }
@@ -262 +264 @@
 
         void GenType::postvisit( TupleType * tupleType ) {
-                assertf( ! genC, "Tuple types should not reach code generation." );
+                assertf( ! options.genC, "Tuple types should not reach code generation." );
                 unsigned int i = 0;
                 std::ostringstream os;
@@ -268 +270 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", options ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "] ";
@@ -281 +283 @@
         void GenType::postvisit( ZeroType * zeroType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = (pretty ? "zero_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "zero_t " : "long int ") + typeString;
                 handleQualifiers( zeroType );
         }
@@ -287 +289 @@
         void GenType::postvisit( OneType * oneType ) {
                 // ideally these wouldn't hit codegen at all, but should be safe to make them ints
-                typeString = (pretty ? "one_t " : "long int ") + typeString;
+                typeString = (options.pretty ? "one_t " : "long int ") + typeString;
                 handleQualifiers( oneType );
         }
 
         void GenType::postvisit( GlobalScopeType * globalType ) {
-                assertf( ! genC, "Global scope type should not reach code generation." );
+                assertf( ! options.genC, "Global scope type should not reach code generation." );
                 handleQualifiers( globalType );
         }
 
         void GenType::postvisit( TraitInstType * inst ) {
-                assertf( ! genC, "Trait types should not reach code generation." );
+                assertf( ! options.genC, "Trait types should not reach code generation." );
                 typeString = inst->name + " " + typeString;
                 handleQualifiers( inst );
@@ -304 +306 @@
         void GenType::postvisit( TypeofType * typeof ) {
                 std::ostringstream os;
-                PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                PassVisitor<CodeGenerator> cg( os, options );
                 os << "typeof(";
                 typeof->expr->accept( cg );
@@ -313 +315 @@
 
         void GenType::postvisit( QualifiedType * qualType ) {
-                assertf( ! genC, "Qualified types should not reach code generation." );
-                std::ostringstream os;
-                os << genType( qualType->parent, "", pretty, genC, lineMarks ) << "." << genType( qualType->child, "", pretty, genC, lineMarks ) << typeString;
+                assertf( ! options.genC, "Qualified types should not reach code generation." );
+                std::ostringstream os;
+                os << genType( qualType->parent, "", options ) << "." << genType( qualType->child, "", options ) << typeString;
                 typeString = os.str();
                 handleQualifiers( qualType );
@@ -333 +335 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_lvalue() && ! genC ) {
+                if ( type->get_lvalue() && ! options.genC ) {
                         // when not generating C code, print lvalue for debugging.
                         typeString = "lvalue " + typeString;