Changeset e3b2474 for src/Parser

Timestamp:

Jul 3, 2018, 3:25:56 PM (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:

638ac26

Parents:

c653b37 (diff), bbe1a87 (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:

• LinkageSpec.h (modified) (3 diffs)
• parser.yy (modified) (7 diffs)

src/Parser/LinkageSpec.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:24:28 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:32:16 2017
-// Update Count     : 14
+// Last Modified On : Mon Jul  2 07:46:49 2018
+// Update Count     : 16
 //
 
@@ -22 +22 @@
 namespace LinkageSpec {
         // All linkage specs are some combination of these flags:
-        enum {
-                Mangle = 1 << 0,
-                Generate = 1 << 1,
-                Overrideable = 1 << 2,
-                Builtin = 1 << 3,
-                GccBuiltin = 1 << 4,
-
-                NoOfSpecs = 1 << 5,
-        };
+        enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
 
         union Spec {
@@ -42 +34 @@
                 };
                 constexpr Spec( unsigned int val ) : val( val ) {}
-                constexpr Spec( Spec const &other ) : val( other.val ) {}
+                constexpr Spec( Spec const & other ) : val( other.val ) {}
                 // Operators may go here.
                 // Supports == and !=
-                constexpr operator unsigned int () const { return val; }
+                constexpr operator unsigned int() const { return val; }
         };
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 24 10:41:10 2018
-// Update Count     : 3587
+// Last Modified On : Mon Jul  2 20:23:14 2018
+// Update Count     : 3607
 //
 
@@ -112 +112 @@
         for ( DeclarationNode *iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
                 iter->set_extension( true );
+        } // for
+} // distExt
+
+void distQual( DeclarationNode * declaration, DeclarationNode * qualifiers ) {
+        // distribute qualifiers across all declarations in a distribution statemement
+        for ( DeclarationNode * iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
+                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
+                        iter->addQualifiers( qualifiers->clone() );
+                } // if
         } // for
 } // distExt
@@ -1136 +1145 @@
 
 waitfor:
-        WAITFOR '(' identifier ')'
-                {
-                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
-                        delete $3;
-                }
-        | WAITFOR '(' identifier ',' argument_expression_list ')'
-                {
-                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
-                        $$->set_last( $5 );
-                        delete $3;
-                }
+        WAITFOR '(' cast_expression ')'
+                { $$ = $3; }
+        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
         ;
 
@@ -1163 +1165 @@
                 { $$ = build_waitfor_timeout( nullptr, $3, $1 ); }
                 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)
+        | when_clause_opt timeout statement WOR ELSE statement
+                { SemanticError( yylloc, "else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }
         | when_clause_opt timeout statement WOR when_clause ELSE statement
                 { $$ = build_waitfor_timeout( $2, $3, $1, $7, $5 ); }
@@ -2380 +2384 @@
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
-                        for ( DeclarationNode * iter = $5; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
-                                        iter->addQualifiers( $1->clone() );
-                                } // if
-                        } // for
+                        distQual( $5, $1 );
                         xxx = false;
                         delete $1;
@@ -2391 +2391 @@
         | declaration_qualifier_list
                 {
-                        if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( $1->type->forall ) xxx = forall = true; // remember generic type
+                        if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type && $1->type->forall ) xxx = forall = true; // remember generic type
                 }
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
-                        for ( DeclarationNode * iter = $5; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                if ( isMangled( iter->linkage ) ) {             // ignore extern "C"
-                                        iter->addQualifiers( $1->clone() );
-                                } // if
-                        } // for
+                        distQual( $5, $1 );
                         xxx = false;
                         delete $1;
@@ -2412 +2408 @@
           '{' up external_definition_list_opt down '}'          // CFA, namespace
                 {
-                        for ( DeclarationNode * iter = $6; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                                if ( isMangled( iter->linkage ) && isMangled( $2->linkage ) ) { // ignore extern "C"
-                                        iter->addQualifiers( $1->clone() );
-                                        iter->addQualifiers( $2->clone() );
-                                } // if
-                        } // for
+                        distQual( $6, $2 );
+                        distQual( $6, $1 );
                         xxx = false;
                         delete $1;