Changeset 455a7d5 for src/CodeGen/GenType.cc

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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' into jenkins-sandbox

File:

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

src/CodeGen/GenType.cc

@@ -27 +27 @@
 namespace CodeGen {
         struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
-                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; }
+                std::string typeString;
+                GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks );
 
                 void previsit( BaseSyntaxNode * );
@@ -58 +57 @@
                 void genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic );
 
-                std::string typeString;
-                bool pretty = false; // pretty print
-                bool genC = false;   // generating C code?
-                bool lineMarks = false;
+                bool pretty = false;    // pretty print
+                bool genC = false;      // generating C code?
+                bool lineMarks = false; // lineMarks on for CodeGenerator?
         };
 
@@ -74 +72 @@
 
                 type->accept( gt );
-                return os.str() + gt.pass.get_typeString();
+                return os.str() + gt.pass.typeString;
         }