Changeset 610194e

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

Location:

src/Parser

Files:

• TypeData.cc (modified) (5 diffs)
• TypeData.h (modified) (5 diffs)
• TypedefTable.cc (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  6 17:40:33 2018
-// Update Count     : 604
+// Last Modified On : Thu Jul 12 13:52:09 2018
+// Update Count     : 606
 //
 
@@ -76 +76 @@
                 aggregate.parent = nullptr;
                 aggregate.anon = false;
+                aggregate.inLine = false;
                 break;
           case AggregateInst:
@@ -81 +82 @@
                 aggInst.aggregate = nullptr;
                 aggInst.params = nullptr;
-                aggInst.hoistType = false;;
+                aggInst.hoistType = false;
+                aggInst.inLine = false;
                 break;
           case Symbolic:
@@ -219 +221 @@
                 newtype->aggregate.body = aggregate.body;
                 newtype->aggregate.anon = aggregate.anon;
+                newtype->aggregate.inLine = aggregate.inLine;
                 newtype->aggregate.tagged = aggregate.tagged;
                 newtype->aggregate.parent = aggregate.parent ? new string( *aggregate.parent ) : nullptr;
@@ -226 +229 @@
                 newtype->aggInst.params = maybeClone( aggInst.params );
                 newtype->aggInst.hoistType = aggInst.hoistType;
+                newtype->aggInst.inLine = aggInst.inLine;
                 break;
           case Enum:

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 );

src/Parser/TypedefTable.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// TypedefTable.cc -- 
+// TypedefTable.cc --
 //
 // Author           : Peter A. Buhr
@@ -100 +100 @@
 void TypedefTable::up( bool forall ) {
         level += 1;
-        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, forall | getEnclForall() };
+        kindTable.getNote( kindTable.currentScope() ) = (Note){ level, static_cast<bool>(forall | getEnclForall()) };
         debugPrint( cerr << "Up " << " level " << level << " note " << kindTable.getNote( level ).level << ", " << kindTable.getNote( level ).forall << endl; );
 } // TypedefTable::up

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jul 11 11:55:24 2018
-// Update Count     : 3739
+// Last Modified On : Thu Jul 12 13:47:44 2018
+// Update Count     : 3755
 //
 
@@ -1936 +1936 @@
         | EXTENSION type_specifier field_declaring_list ';'     // GCC
                 { distExt( $3 ); $$ = distAttr( $2, $3 ); }             // mark all fields in list
+        | INLINE type_specifier field_declaring_list ';'        // CFA
+                {
+                        if ( $2->type && ( $2->type->kind == TypeData::Aggregate || $2->type->kind == TypeData::AggregateInst ) ) {
+                                if ( $2->type->kind == TypeData::Aggregate ) {
+                                        $2->type->aggregate.inLine = true;
+                                } else {
+                                        $2->type->aggInst.inLine = true;
+                                } // if
+                                $$ = distAttr( $2, $3 );
+                        } else {
+                                SemanticError( yylloc, "inline qualifier only allowed for aggregate field declarations." ); $$ = nullptr;
+                        } // if 
+                }
         | typedef_declaration ';'                                                       // CFA
         | cfa_field_declaring_list ';'                                          // CFA, new style field declaration