Changes in / [1f81d61:533540a]

Location:

src

Files:

• Parser/parser.yy (modified) (12 diffs)
• tests/concurrent/examples/datingService.c (modified) (4 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 : Thu May 24 18:11:59 2018
-// Update Count     : 3369
+// Last Modified On : Mon May 28 17:01:36 2018
+// Update Count     : 3383
 //
 
@@ -324 +324 @@
 %type<decl> cfa_identifier_parameter_declarator_tuple cfa_identifier_parameter_ptr
 
-%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list_opt
+%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_ellipsis_list_opt
 
 %type<decl> cfa_typedef_declaration cfa_variable_declaration cfa_variable_specifier
@@ -835 +835 @@
 //      '[' ']'
 //              { $$ = new ExpressionNode( build_tuple() ); }
-//      '[' push assignment_expression pop ']'
+//      | '[' push assignment_expression pop ']'
 //              { $$ = new ExpressionNode( build_tuple( $3 ) ); }
         '[' push ',' tuple_expression_list pop ']'
@@ -1364 +1364 @@
         | declaration_qualifier_list type_qualifier_list cfa_function_specifier
                 { $$ = $3->addQualifiers( $1 )->addQualifiers( $2 ); }
-        | cfa_function_declaration ',' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
+        | cfa_function_declaration ',' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 {
                         // Append the return type at the start (left-hand-side) to each identifier in the list.
                         DeclarationNode * ret = new DeclarationNode;
                         ret->type = maybeClone( $1->type->base );
-                        $$ = $1->appendList( DeclarationNode::newFunction( $3, ret, $5, nullptr ) );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $3, ret, $6, nullptr ) );
                 }
         ;
 
 cfa_function_specifier:                                                                 // CFA
-//      '[' ']' identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')' // S/R conflict
+//      '[' ']' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')' // S/R conflict
 //              {
 //                      $$ = DeclarationNode::newFunction( $3, DeclarationNode::newTuple( 0 ), $6, 0, true );
 //              }
-//      '[' ']' identifier '(' push cfa_parameter_type_list_opt pop ')'
+//      '[' ']' identifier '(' push cfa_parameter_ellipsis_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
 //                      $$ = DeclarationNode::newFunction( $5, DeclarationNode::newTuple( 0 ), $8, 0, true );
 //              }
-//      | '[' ']' TYPEDEFname '(' push cfa_parameter_type_list_opt pop ')'
+//      | '[' ']' TYPEDEFname '(' push cfa_parameter_ellipsis_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
@@ -1391 +1391 @@
                 // identifier_or_type_name must be broken apart because of the sequence:
                 //
-                //   '[' ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
+                //   '[' ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
                 //   '[' ']' type_specifier
                 //
                 // type_specifier can resolve to just TYPEDEFname (e.g., typedef int T; int f( T );). Therefore this must be
                 // flattened to allow lookahead to the '(' without having to reduce identifier_or_type_name.
-        cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+        cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 // To obtain LR(1 ), this rule must be factored out from function return type (see cfa_abstract_declarator).
                 { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
-        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
         ;
@@ -1951 +1951 @@
         ;
 
-cfa_parameter_type_list_opt:                                                    // CFA, abstract + real
+cfa_parameter_ellipsis_list_opt:                                                        // CFA, abstract + real
         // empty
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
@@ -2209 +2209 @@
         '|' no_attr_identifier_or_type_name '(' type_list ')'
                 { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
-        | '|' '{' push trait_declaration_list '}'
+        | '|' '{' push trait_declaration_list pop '}'
                 { $$ = $4; }
-        | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}' '(' type_list ')'
+        | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list pop '}' '(' type_list ')'
                 { SemanticError( yylloc, "Generic data-type assertion is currently unimplemented." ); $$ = nullptr; }
         ;
@@ -2257 +2257 @@
         TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
                 { $$ = DeclarationNode::newTrait( $2, $5, 0 ); }
-        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}'
+        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' push trait_declaration_list pop '}'
                 { $$ = DeclarationNode::newTrait( $2, $5, $10 ); }
         ;
@@ -2263 +2263 @@
 trait_declaration_list:                                                                 // CFA
         trait_declaration
-        | trait_declaration_list push trait_declaration
-                { $$ = $1->appendList( $3 ); }
+        | trait_declaration_list pop push trait_declaration
+                { $$ = $1->appendList( $4 ); }
         ;
 
 trait_declaration:                                                                              // CFA
-        cfa_trait_declaring_list pop ';'
-        | trait_declaring_list pop ';'
+        cfa_trait_declaring_list ';'
+        | trait_declaring_list ';'
         ;
 
@@ -2974 +2974 @@
         '[' ']'
                 { $$ = DeclarationNode::newArray( 0, 0, false ); }
-        // multi_array_dimension handles the '[' '*' ']' case
+                // multi_array_dimension handles the '[' '*' ']' case
         | '[' push type_qualifier_list '*' pop ']'                      // remaining C99
                 { $$ = DeclarationNode::newVarArray( $3 ); }
         | '[' push type_qualifier_list pop ']'
                 { $$ = DeclarationNode::newArray( 0, $3, false ); }
-        // multi_array_dimension handles the '[' assignment_expression ']' case
+                // multi_array_dimension handles the '[' assignment_expression ']' case
         | '[' push type_qualifier_list assignment_expression pop ']'
                 { $$ = DeclarationNode::newArray( $4, $3, false ); }
@@ -3115 +3115 @@
 //
 //              cfa_abstract_tuple identifier_or_type_name
-//              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
+//              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
 //
 // since a function return type can be syntactically identical to a tuple type:
@@ -3174 +3174 @@
         '[' push cfa_abstract_parameter_list pop ']'
                 { $$ = DeclarationNode::newTuple( $3 ); }
+        | '[' push type_specifier_nobody ELLIPSIS ']'
+                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
+        | '[' push type_specifier_nobody ELLIPSIS constant_expression ']'
+                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
         ;
 
 cfa_abstract_function:                                                                  // CFA
-//      '[' ']' '(' cfa_parameter_type_list_opt ')'
+//      '[' ']' '(' cfa_parameter_ellipsis_list_opt ')'
 //              { $$ = DeclarationNode::newFunction( nullptr, DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
-        cfa_abstract_tuple '(' push cfa_parameter_type_list_opt pop ')'
+        cfa_abstract_tuple '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
-        | cfa_function_return '(' push cfa_parameter_type_list_opt pop ')'
+        | cfa_function_return '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
         ;

src/tests/concurrent/examples/datingService.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:56:20 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar 14 22:48:40 2018
-// Update Count     : 23
+// Last Modified On : Sun May 27 09:05:18 2018
+// Update Count     : 26
 //
 
@@ -18 +18 @@
 #include <unistd.h>                                                                             // getpid
 
-enum { NoOfPairs = 20 };
+enum { CompCodes = 20 };                                                                // number of compatibility codes
 
 monitor DatingService {
-        condition Girls[NoOfPairs], Boys[NoOfPairs];
+        condition Girls[CompCodes], Boys[CompCodes];
         unsigned int GirlPhoneNo, BoyPhoneNo;
 }; // DatingService
@@ -47 +47 @@
 } // DatingService boy
 
-unsigned int girlck[NoOfPairs];
-unsigned int boyck[NoOfPairs];
+unsigned int girlck[CompCodes];
+unsigned int boyck[CompCodes];
 
 thread Girl {
@@ -88 +88 @@
 int main() {
         DatingService TheExchange;
-        Girl * girls[NoOfPairs];
-        Boy  * boys[NoOfPairs];
+        Girl * girls[CompCodes];
+        Boy  * boys[CompCodes];
 
         srandom( /*getpid()*/ 103 );
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 girls[i] = new( &TheExchange, i, i );
-                boys[i]  = new( &TheExchange, i, NoOfPairs - ( i + 1 ) );
+                boys[i]  = new( &TheExchange, i, CompCodes - ( i + 1 ) );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 delete( boys[i] );
                 delete( girls[i] );
         } // for
 
-        for ( unsigned int i = 0; i < NoOfPairs; i += 1 ) {
+        for ( unsigned int i = 0; i < CompCodes; i += 1 ) {
                 if ( girlck[ boyck[i] ] != boyck[ girlck[i] ] ) abort();
         } // for