Changeset 610194e for src/Parser/TypeData.h

Timestamp:

Jul 13, 2018, 11:36:05 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

2e02851

Parents:

825170d (diff), 79caea8 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/TypeData.h (modified) (5 diffs)

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 22 15:21:23 2018
-// Update Count     : 191
+// Last Modified On : Thu Jul 12 14:00:09 2018
+// Update Count     : 193
 //
 
@@ -37 +37 @@
                 bool body;
                 bool anon;
+                bool inLine;
 
                 bool tagged;
@@ -46 +47 @@
                 ExpressionNode * params;
                 bool hoistType;
+                bool inLine;
         };
 
@@ -66 +68 @@
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
-                ExpressionNode * withExprs;             // expressions from function's with_clause
+                ExpressionNode * withExprs;                                             // expressions from function's with_clause
         };
 
@@ -128 +130 @@
 TupleType * buildTuple( const TypeData * );
 TypeofType * buildTypeof( const TypeData * );
-Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName, Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
+Declaration * buildDecl( const TypeData *, const std::string &, Type::StorageClasses, Expression *, Type::FuncSpecifiers funcSpec, LinkageSpec::Spec, Expression * asmName,
+                                                 Initializer * init = nullptr, std::list< class Attribute * > attributes = std::list< class Attribute * >() );
 FunctionType * buildFunction( const TypeData * );
 void buildKRFunction( const TypeData::Function_t & function );