Changeset e9e4e9ee for src/Parser/parser.yy

Timestamp:

Jan 19, 2017, 11:04:27 AM (9 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

2175062

Parents:

5ebb2fbc (diff), 68e6031 (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

File:

• src/Parser/parser.yy (modified) (10 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 : Wed Dec 14 21:28:22 2016
-// Update Count     : 2090
+// Last Modified On : Wed Jan 18 15:51:25 2017
+// Update Count     : 2135
 //
 
@@ -32 +32 @@
 //
 // 1. designation with and without '=' (use ':' instead)
-// 2. attributes not allowed in parenthesis of declarator
 //
 // All of the syntactic extensions for GCC C are marked with the comment "GCC". The second extensions are for Cforall
@@ -136 +135 @@
 
 %type<tok> identifier  no_01_identifier  no_attr_identifier zero_one
-%type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  no_01_identifier_or_type_name
+%type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  no_01_identifier_or_type_name  attr_name
 %type<constant> string_literal
 %type<str> string_literal_list
@@ -253 +252 @@
 %type<decl> variable_abstract_ptr variable_array variable_declarator variable_function variable_ptr
 
-%type<decl> attribute_list_opt attribute_list attribute
+%type<decl> attribute_list_opt attribute_list attribute_name_list attribute attribute_name
 
 // initializers
@@ -709 +708 @@
 
 labeled_statement:
-                // labels cannot be identifiers 0 or 1
-        IDENTIFIER ':' attribute_list_opt statement
-                {
-                        $$ = $4->add_label( $1 );
+                // labels cannot be identifiers 0 or 1 or ATTR_IDENTIFIER
+        identifier_or_type_name ':' attribute_list_opt statement
+                {
+                        $$ = $4->add_label( $1, $3 );
                 }
         ;
@@ -877 +876 @@
 
 jump_statement:
-        GOTO IDENTIFIER ';'
+        GOTO identifier_or_type_name ';'
                 { $$ = new StatementNode( build_branch( $2, BranchStmt::Goto ) ); }
         | GOTO '*' comma_expression ';'                                         // GCC, computed goto
@@ -886 +885 @@
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
                 { $$ = new StatementNode( build_branch( BranchStmt::Continue ) ); }
-        | CONTINUE IDENTIFIER ';'                                                       // CFA, multi-level continue
+        | CONTINUE identifier_or_type_name ';'                          // CFA, multi-level continue
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
@@ -893 +892 @@
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
                 { $$ = new StatementNode( build_branch( BranchStmt::Break ) ); }
-        | BREAK IDENTIFIER ';'                                                          // CFA, multi-level exit
+        | BREAK identifier_or_type_name ';'                                     // CFA, multi-level exit
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
@@ -1326 +1325 @@
         type_qualifier_name
         | attribute
-                //{ $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
         ;
 
@@ -2177 +2175 @@
 
 attribute:                                                                                              // GCC
-        ATTRIBUTE '(' '(' attribute_parameter_list ')' ')'
-        //              { $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+        ATTRIBUTE '(' '(' attribute_name_list ')' ')'
+                { $$ = $4; }
+        ;
+
+attribute_name_list:                                                                    // GCC
+        attribute_name
+        | attribute_name_list ',' attribute_name
+                { $$ = $1->addQualifiers( $3 ); } 
+        ;
+
+attribute_name:                                                                                 // GCC
+        // empty
                 { $$ = nullptr; }
-        ;
-
-attribute_parameter_list:                                                               // GCC
-        attrib
-        | attribute_parameter_list ',' attrib
-        ;
-
-attrib:                                                                                                 // GCC
-        // empty
-        | any_word
-        | any_word '(' comma_expression_opt ')' { delete $3; } // FIX ME: unimplemented
-        ;
-
-any_word:                                                                                               // GCC
-        identifier_or_type_name { delete $1; }                          // FIX ME: unimplemented
-        | storage_class { delete $1; }                                          // FIX ME: unimplemented
-        | basic_type_name { delete $1; }                                        // FIX ME: unimplemented
-        | type_qualifier { delete $1; }                                         // FIX ME: unimplemented
+        | attr_name
+                { $$ = DeclarationNode::newAttribute( $1 ); }
+        | attr_name '(' argument_expression_list ')'
+                { $$ = DeclarationNode::newAttribute( $1, $3 ); }
+        ;
+
+attr_name:                                                                                              // GCC
+        IDENTIFIER
+        | TYPEDEFname
+        | TYPEGENname
+        | CONST
+                { $$ = Token{ new string( "__const__" ) }; }
         ;