Changeset c850687 for src/CodeGen/GenType.cc

Timestamp:

May 11, 2017, 11:07:58 AM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8514fe19

Parents:

29cf9c8

Message:

Add -L flag to turn of line marks. Updated the keyword list.

File:

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

src/CodeGen/GenType.cc

@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString, bool pretty = false, bool genC = false );
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
@@ -54 +54 @@
                 bool pretty = false; // pretty print
                 bool genC = false;   // generating C code?
+                bool lineMarks = false;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC ) {
-                GenType gt( baseString, pretty, genC );
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                GenType gt( baseString, pretty, genC, lineMarks );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         cg.genAttributes( type->get_attributes() );
                 } // if
@@ -73 +74 @@
   }
 
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC ) : typeString( typeString ), pretty( pretty ), genC( genC ) {}
+        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -114 +115 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -168 +169 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(" ;
 
@@ -191 +192 @@
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "forall(";
                         cg.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
@@ -202 +203 @@
                 if ( ! refType->get_parameters().empty() ) {
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(";
                         cg.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
@@ -242 +243 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "]";