Changeset e15b0a0a for src/Parser

Timestamp:

May 26, 2015, 10:41:24 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

4d51835

Parents:

a77e7b5

Message:

allow arbitrary ordering of storage/type qualifiers for new function decl/defn

File:

• src/Parser/cfa.y (modified) (4 diffs)

src/Parser/cfa.y

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 11:55:39 2015
-// Update Count     : 975
+// Last Modified On : Tue May 26 22:38:42 2015
+// Update Count     : 995
 // 
 
@@ -1009 +1009 @@
                                         $$ = $1;
                                 }
-                | declaration_qualifier_list new_function_specifier
-                                // declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
-                                // necessary to preclude them as a type_qualifier cannot appear in this context.
+                | type_qualifier_list new_function_specifier
                                 {
                                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                                         $$ = $2->addQualifiers( $1 );
+                                }
+                | declaration_qualifier_list new_function_specifier
+                                {
+                                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                                        $$ = $2->addQualifiers( $1 );
+                                }
+                | declaration_qualifier_list type_qualifier_list new_function_specifier
+                                {
+                                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                                        $$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
                                 }
                 | new_function_declaration pop ',' push identifier_or_typedef_name
@@ -1904 +1912 @@
 
 function_definition:
-                new_function_specifier compound_statement               // CFA
+                new_function_declaration compound_statement             // CFA
                                 {
                                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -1910 +1918 @@
                                         $$ = $1->addFunctionBody( $2 );
                                 }
-                | declaration_qualifier_list new_function_specifier compound_statement // CFA
-                                // declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
-                                // necessary to preclude them as a type_qualifier cannot appear in this context.
-                                {
-                                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                                        typedefTable.leaveScope();
-                                        $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
-                                }
-
+//              | declaration_qualifier_list new_function_specifier compound_statement // CFA
+//                              // declaration_qualifier_list also includes type_qualifier_list, so a semantic check is
+//                              // necessary to preclude them as a type_qualifier cannot appear in this context.
+//                              {
+//                                      typedefTable.addToEnclosingScope( TypedefTable::ID );
+//                                      typedefTable.leaveScope();
+//                                      $$ = $2->addFunctionBody( $3 )->addQualifiers( $1 );
+//                              }
                 | declaration_specifier function_declarator compound_statement
                                 {