Changeset 633c711

Timestamp:

Oct 17, 2017, 12:06:22 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8e138da

Parents:

fb31cb8 (diff), b6b3c42 (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:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (9 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct  2 18:18:55 2017
-// Update Count     : 2835
+// Last Modified On : Mon Oct 16 11:07:29 2017
+// Update Count     : 2892
 //
 
@@ -250 +250 @@
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
+%type<sn> mutex_statement
 %type<en> when_clause                                   when_clause_opt                         waitfor                                         timeout
 %type<sn> waitfor_statement
@@ -807 +808 @@
         | jump_statement
         | with_statement
+        | mutex_statement
         | waitfor_statement
         | exception_statement
@@ -1031 +1033 @@
         ;
 
+// If MUTEX becomes a general qualifier, there are shift/reduce conflicts, so change syntax to "with mutex".
+mutex_statement:
+        MUTEX '(' argument_expression_list ')' statement
+                { $$ = nullptr; }                                                               // FIX ME
+        ;
+
 when_clause:
         WHEN '(' comma_expression ')'
@@ -1549 +1557 @@
         | VOLATILE
                 { $$ = DeclarationNode::newTypeQualifier( Type::Volatile ); }
-        | MUTEX
-                { $$ = DeclarationNode::newTypeQualifier( Type::Mutex ); }
         | ATOMIC
                 { $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
@@ -2703 +2709 @@
         paren_identifier attribute_list_opt
                 { $$ = $1->addQualifiers( $2 ); }
+        | '&' MUTEX paren_identifier attribute_list_opt
+                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
         | identifier_parameter_ptr
         | identifier_parameter_array attribute_list_opt
@@ -2743 +2751 @@
 //
 //              typedef int foo;
+//              forall( otype T ) foo( T );
 //              int f( int foo ); // redefine typedef name in new scope
 //
@@ -2750 +2759 @@
         typedef attribute_list_opt
                 { $$ = $1->addQualifiers( $2 ); }
+        | '&' MUTEX typedef attribute_list_opt
+                { $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
         | type_parameter_ptr
         | type_parameter_array attribute_list_opt
@@ -2896 +2907 @@
 abstract_parameter_declarator:
         abstract_parameter_ptr
+        | '&' MUTEX attribute_list_opt
+                { $$ = DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf )->addQualifiers( $3 ); }
         | abstract_parameter_array attribute_list_opt
                 { $$ = $1->addQualifiers( $2 ); }