Changeset 893256d for src/Parser/parser.yy

Timestamp:

Jul 20, 2015, 2:29:52 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

18997b9

Parents:

2794fff (diff), 994ec2c (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' into ctor

Conflicts:

src/Parser/ParseNode.h

File:

• src/Parser/parser.yy (modified) (15 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 : Fri Jul  3 13:53:45 2015
-// Update Count     : 1220
+// Last Modified On : Thu Jul 16 16:25:12 2015
+// Update Count     : 1267
 // 
 
@@ -54 +54 @@
 #include "lex.h"
 #include "ParseNode.h"
+#include "TypeData.h"
 #include "LinkageSpec.h"
 
@@ -227 +228 @@
 %type<decl> variable_abstract_array variable_abstract_declarator variable_abstract_function
 %type<decl> variable_abstract_ptr variable_array variable_declarator variable_function variable_ptr
+
+%type<decl> attribute_list_opt attribute_list attribute
 
 // initializers
@@ -620 +623 @@
 labeled_statement:
         no_attr_identifier ':' attribute_list_opt statement
-                { $$ = $4->add_label( $1 );}
+                {
+                        $$ = $4->add_label( $1 );
+                }
         ;
 
@@ -1182 +1187 @@
         type_qualifier_name
         | attribute
-                { $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+        //{ $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
         ;
 
@@ -1997 +2002 @@
 attribute_list_opt:                                                                             // GCC
         // empty
+                { $$ = 0; }
         | attribute_list
         ;
@@ -2003 +2009 @@
         attribute
         | attribute_list attribute
+                { $$ = $2->addQualifiers( $1 ); }
         ;
 
 attribute:                                                                                              // GCC
         ATTRIBUTE '(' '(' attribute_parameter_list ')' ')'
+        //              { $$ = DeclarationNode::newQualifier( DeclarationNode::Attribute ); }
+                { $$ = 0; }
         ;
 
@@ -2059 +2068 @@
 variable_declarator:
         paren_identifier attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | variable_ptr
         | variable_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | variable_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2108 +2120 @@
 function_declarator:
         function_no_ptr attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | function_ptr
         | function_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2188 +2202 @@
 type_redeclarator:
         paren_type attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | type_ptr
         | type_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | type_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2235 +2252 @@
 identifier_parameter_declarator:
         paren_identifier attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | identifier_parameter_ptr
         | identifier_parameter_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | identifier_parameter_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2297 +2317 @@
 type_parameter_redeclarator:
         typedef attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | type_parameter_ptr
         | type_parameter_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | type_parameter_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2350 +2373 @@
         abstract_ptr
         | abstract_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | abstract_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2417 +2442 @@
         abstract_parameter_ptr
         | abstract_parameter_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | abstract_parameter_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -2493 +2520 @@
         variable_abstract_ptr
         | variable_abstract_array attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         | variable_abstract_function attribute_list_opt
+                { $$ = $1->addQualifiers( $2 ); }
         ;