Changeset 60401b76 for src/Parser/parser.yy

Timestamp:

Feb 28, 2017, 4:44:00 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

be65cca

Parents:

1e6b350 (diff), 20221d4 (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) (16 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 Feb 23 15:23:49 2017
-// Update Count     : 2187
+// Last Modified On : Tue Feb 28 09:58:10 2017
+// Update Count     : 2208
 //
 
@@ -196 +196 @@
 
 %type<aggKey> aggregate_key
-%type<decl>  aggregate_type
+%type<decl> aggregate_type aggregate_type_nobody
 
 %type<decl> assertion assertion_list_opt
@@ -207 +207 @@
 
 %type<decl> declaration declaration_list declaration_list_opt declaration_qualifier_list
-%type<decl> declaration_specifier declarator declaring_list
-
-%type<decl> elaborated_type
-
-%type<decl> enumerator_list enum_type
+%type<decl> declaration_specifier declaration_specifier_nobody declarator declaring_list
+
+%type<decl> elaborated_type elaborated_type_nobody
+
+%type<decl> enumerator_list enum_type enum_type_nobody
 %type<en> enumerator_value_opt
 
@@ -251 +251 @@
 %type<decl> storage_class storage_class_list
 
-%type<decl> sue_declaration_specifier sue_type_specifier
+%type<decl> sue_declaration_specifier sue_declaration_specifier_nobody sue_type_specifier sue_type_specifier_nobody
 
 %type<tclass> type_class
@@ -268 +268 @@
 %type<en> type_name_list
 
-%type<decl> type_qualifier type_qualifier_name type_qualifier_list type_qualifier_list_opt type_specifier
+%type<decl> type_qualifier type_qualifier_name type_qualifier_list type_qualifier_list_opt type_specifier type_specifier_nobody
 
 %type<decl> variable_declarator variable_ptr variable_array variable_function
@@ -973 +973 @@
 
 exception_declaration:
-                // A semantic check is required to ensure type_specifier does not create a new type, e.g.:
-                //
-                //              catch ( struct { int i; } x ) ...
-                //
-                // This new type cannot catch any thrown type because of name equivalence among types.
-        type_specifier
-        | type_specifier declarator
+                // No SUE declaration in parameter list.
+        type_specifier_nobody
+        | type_specifier_nobody declarator
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         $$ = $2->addType( $1 );
                 }
-        | type_specifier variable_abstract_declarator
+        | type_specifier_nobody variable_abstract_declarator
                 { $$ = $2->addType( $1 ); }
         | cfa_abstract_declarator_tuple no_attr_identifier      // CFA
@@ -1349 +1345 @@
         ;
 
-type_specifier:                                                                                 // declaration specifier - storage class
+declaration_specifier_nobody:                                                   // type specifier + storage class - {...}
+                // Preclude SUE declarations in restricted scopes:
+                //
+                //    int f( struct S { int i; } s1, Struct S s2 ) { struct S s3; ... }
+                //
+                // because it is impossible to call f due to name equivalence.
+        basic_declaration_specifier
+        | sue_declaration_specifier_nobody
+        | typedef_declaration_specifier
+        | typegen_declaration_specifier
+        ;
+
+type_specifier:                                                                                 // type specifier
         basic_type_specifier
         | sue_type_specifier
+        | typedef_type_specifier
+        | typegen_type_specifier
+        ;
+
+type_specifier_nobody:                                                                  // type specifier - {...}
+                // Preclude SUE declarations in restricted scopes:
+                //
+                //    int f( struct S { int i; } s1, Struct S s2 ) { struct S s3; ... }
+                //
+                // because it is impossible to call f due to name equivalence.
+        basic_type_specifier
+        | sue_type_specifier_nobody
         | typedef_type_specifier
         | typegen_type_specifier
@@ -1514 +1534 @@
         ;
 
-sue_declaration_specifier:
+sue_declaration_specifier:                                                              // struct, union, enum + storage class + type specifier
         sue_type_specifier
         | declaration_qualifier_list sue_type_specifier
@@ -1524 +1544 @@
         ;
 
-sue_type_specifier:
-        elaborated_type                                                                         // struct, union, enum
+sue_type_specifier:                                                                             // struct, union, enum + type specifier
+        elaborated_type
         | type_qualifier_list elaborated_type
                 { $$ = $2->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
+                { $$ = $1->addQualifiers( $2 ); }
+        ;
+
+sue_declaration_specifier_nobody:                                               // struct, union, enum - {...} + storage class + type specifier
+        sue_type_specifier_nobody
+        | declaration_qualifier_list sue_type_specifier_nobody
+                { $$ = $2->addQualifiers( $1 ); }
+        | sue_declaration_specifier_nobody storage_class        // remaining OBSOLESCENT (see 2)
+                { $$ = $1->addQualifiers( $2 ); }
+        | sue_declaration_specifier_nobody storage_class type_qualifier_list
+                { $$ = $1->addQualifiers( $2 )->addQualifiers( $3 ); }
+        ;
+
+sue_type_specifier_nobody:                                                              // struct, union, enum - {...} + type specifier
+        elaborated_type_nobody
+        | type_qualifier_list elaborated_type_nobody
+                { $$ = $2->addQualifiers( $1 ); }
+        | sue_type_specifier_nobody type_qualifier
                 { $$ = $1->addQualifiers( $2 ); }
         ;
@@ -1551 +1589 @@
         ;
 
-elaborated_type:
+elaborated_type:                                                                                // struct, union, enum
         aggregate_type
         | enum_type
         ;
 
-aggregate_type:
+elaborated_type_nobody:                                                                 // struct, union, enum - {...}
+        aggregate_type_nobody
+        | enum_type_nobody
+        ;
+
+aggregate_type:                                                                                 // struct, union
         aggregate_key attribute_list_opt '{' field_declaration_list '}'
                 { $$ = DeclarationNode::newAggregate( $1, nullptr, nullptr, $4, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
-                {
-                        typedefTable.makeTypedef( *$3 );
-                        $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
-                }
         | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }
@@ -1570 +1608 @@
         | aggregate_key attribute_list_opt '(' type_name_list ')' '{' field_declaration_list '}' // CFA
                 { $$ = DeclarationNode::newAggregate( $1, nullptr, $4, $7, false )->addQualifiers( $2 ); }
+        | aggregate_type_nobody
+        ;
+
+aggregate_type_nobody:                                                                  // struct, union - {...}
+        aggregate_key attribute_list_opt no_attr_identifier_or_type_name
+                {
+                        typedefTable.makeTypedef( *$3 );
+                        $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
+                }
         | aggregate_key attribute_list_opt typegen_name         // CFA, S/R conflict
                 { $$ = $3->addQualifiers( $2 ); }
@@ -1647 +1694 @@
         ;
 
-enum_type:
+enum_type:                                                                                              // enum
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
-        | ENUM attribute_list_opt no_attr_identifier_or_type_name
-                {
-                        typedefTable.makeTypedef( *$3 );
-                        $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
-                }
         | ENUM attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
+        | enum_type_nobody
+        ;
+
+enum_type_nobody:                                                                               // enum - {...}
+        ENUM attribute_list_opt no_attr_identifier_or_type_name
+                {
+                        typedefTable.makeTypedef( *$3 );
+                        $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
+                }
         ;
 
@@ -1759 +1810 @@
 
 parameter_declaration:
-        declaration_specifier identifier_parameter_declarator assignment_opt
+                // No SUE declaration in parameter list.
+        declaration_specifier_nobody identifier_parameter_declarator assignment_opt
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
                 }
-        | declaration_specifier type_parameter_redeclarator assignment_opt
+        | declaration_specifier_nobody type_parameter_redeclarator assignment_opt
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -1772 +1824 @@
 
 abstract_parameter_declaration:
-        declaration_specifier assignment_opt
+        declaration_specifier_nobody assignment_opt
                 { $$ = $1->addInitializer( $2 ? new InitializerNode( $2 ) : nullptr ); }
-        | declaration_specifier abstract_parameter_declarator assignment_opt
+        | declaration_specifier_nobody abstract_parameter_declarator assignment_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         ;
@@ -2798 +2850 @@
 
 cfa_identifier_parameter_ptr:                                                   // CFA
-        ptrref_operator type_specifier
+                // No SUE declaration in parameter list.
+        ptrref_operator type_specifier_nobody
                 { $$ = $2->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
-        | type_qualifier_list ptrref_operator type_specifier
+        | type_qualifier_list ptrref_operator type_specifier_nobody
                 { $$ = $3->addNewPointer( DeclarationNode::newPointer( $1 ) ); }
         | ptrref_operator cfa_abstract_function
@@ -2815 +2868 @@
                 // Only the first dimension can be empty or have qualifiers. Empty dimension must be factored out due to
                 // shift/reduce conflict with new-style empty (void) function return type.
-        '[' ']' type_specifier
+        '[' ']' type_specifier_nobody
                 { $$ = $3->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-        | cfa_array_parameter_1st_dimension type_specifier
+        | cfa_array_parameter_1st_dimension type_specifier_nobody
                 { $$ = $2->addNewArray( $1 ); }
-        | '[' ']' multi_array_dimension type_specifier
+        | '[' ']' multi_array_dimension type_specifier_nobody
                 { $$ = $4->addNewArray( $3 )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
-        | cfa_array_parameter_1st_dimension multi_array_dimension type_specifier
+        | cfa_array_parameter_1st_dimension multi_array_dimension type_specifier_nobody
                 { $$ = $3->addNewArray( $2 )->addNewArray( $1 ); }
-        | multi_array_dimension type_specifier
+        | multi_array_dimension type_specifier_nobody
                 { $$ = $2->addNewArray( $1 ); }