Changeset 36ebd03 for src/Parser/parser.yy

Timestamp:

Mar 3, 2016, 1:28:56 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

3627356

Parents:

9d7b3ea (diff), 4040425 (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) (14 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 : Mon Feb  1 18:22:42 2016
-// Update Count     : 1483
+// Last Modified On : Wed Mar  2 17:24:45 2016
+// Update Count     : 1495
 // 
 
@@ -74 +74 @@
 %token FORALL LVALUE                                                                    // CFA
 %token VOID CHAR SHORT INT LONG FLOAT DOUBLE SIGNED UNSIGNED
+%token VALIST                                                                                   // GCC
 %token BOOL COMPLEX IMAGINARY                                                   // C99
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token TYPE FTYPE DTYPE CONTEXT                                                 // CFA
+%token OTYPE FTYPE DTYPE TRAIT                                          // CFA
 %token SIZEOF OFFSETOF
 %token ATTRIBUTE EXTENSION                                                              // GCC
@@ -171 +172 @@
 %type<decl> basic_declaration_specifier basic_type_name basic_type_specifier direct_type_name indirect_type_name
 
-%type<decl> context_declaration context_declaration_list context_declaring_list context_specifier
+%type<decl> trait_declaration trait_declaration_list trait_declaring_list trait_specifier
 
 %type<decl> declaration declaration_list declaration_list_opt declaration_qualifier_list
@@ -197 +198 @@
 %type<decl> new_array_parameter_1st_dimension
 
-%type<decl> new_context_declaring_list new_declaration new_field_declaring_list
+%type<decl> new_trait_declaring_list new_declaration new_field_declaring_list
 %type<decl> new_function_declaration new_function_return new_function_specifier
 
@@ -448 +449 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::SizeOf ), new TypeValueNode( $3 )); }
         | OFFSETOF '(' type_name_no_function ',' no_attr_identifier ')'
-        { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::OffsetOf ), new TypeValueNode( $3 ), new VarRefNode( $5 )); }
         | ATTR_IDENTIFIER
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::Attr ), new VarRefNode( $1 )); }
@@ -1020 +1021 @@
         | new_function_declaration pop ';'
         | type_declaring_list pop ';'
-        | context_specifier pop ';'
+        | trait_specifier pop ';'
         ;
 
@@ -1345 +1346 @@
         | IMAGINARY                                                                                     // C99
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+        | VALIST                                                                                        // GCC, __builtin_va_list
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
         ;
 
@@ -1803 +1806 @@
 
 type_class:                                                                                             // CFA
-        TYPE
+        OTYPE
                 { $$ = DeclarationNode::Type; }
         | DTYPE
@@ -1821 +1824 @@
         '|' no_attr_identifier_or_type_name '(' type_name_list ')'
                 {
-                        typedefTable.openContext( *$2 );
-                        $$ = DeclarationNode::newContextUse( $2, $4 );
-                }
-        | '|' '{' push context_declaration_list '}'
+                        typedefTable.openTrait( *$2 );
+                        $$ = DeclarationNode::newTraitUse( $2, $4 );
+                }
+        | '|' '{' push trait_declaration_list '}'
                 { $$ = $4; }
-        | '|' '(' push type_parameter_list pop ')' '{' push context_declaration_list '}' '(' type_name_list ')'
+        | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}' '(' type_name_list ')'
                 { $$ = 0; }
         ;
@@ -1841 +1844 @@
 
 type_declaring_list:                                                                    // CFA
-        TYPE type_declarator
-                { $$ = $2; }
-        | storage_class_list TYPE type_declarator
+        OTYPE type_declarator
+                { $$ = $2; }
+        | storage_class_list OTYPE type_declarator
                 { $$ = $3->addQualifiers( $1 ); }
         | type_declaring_list ',' type_declarator
@@ -1869 +1872 @@
         ;
 
-context_specifier:                                                                              // CFA
-        CONTEXT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
+trait_specifier:                                                                                // CFA
+        TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
                 {
                         typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
-                        $$ = DeclarationNode::newContext( $2, $5, 0 );
-                }
-        | CONTEXT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
-                {
-                        typedefTable.enterContext( *$2 );
+                        $$ = DeclarationNode::newTrait( $2, $5, 0 );
+                }
+        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
+                {
+                        typedefTable.enterTrait( *$2 );
                         typedefTable.enterScope();
                 }
-          context_declaration_list '}'
-                {
-                        typedefTable.leaveContext();
+          trait_declaration_list '}'
+                {
+                        typedefTable.leaveTrait();
                         typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
-                        $$ = DeclarationNode::newContext( $2, $5, $10 );
-                }
-        ;
-
-context_declaration_list:                                                               // CFA
-        context_declaration
-        | context_declaration_list push context_declaration
+                        $$ = DeclarationNode::newTrait( $2, $5, $10 );
+                }
+        ;
+
+trait_declaration_list:                                                         // CFA
+        trait_declaration
+        | trait_declaration_list push trait_declaration
                 { $$ = $1->appendList( $3 ); }
         ;
 
-context_declaration:                                                                    // CFA
-        new_context_declaring_list pop ';'
-        | context_declaring_list pop ';'
-        ;
-
-new_context_declaring_list:                                                             // CFA
+trait_declaration:                                                                      // CFA
+        new_trait_declaring_list pop ';'
+        | trait_declaring_list pop ';'
+        ;
+
+new_trait_declaring_list:                                                               // CFA
         new_variable_specifier
                 {
@@ -1910 +1913 @@
                         $$ = $1;
                 }
-        | new_context_declaring_list pop ',' push identifier_or_type_name
+        | new_trait_declaring_list pop ',' push identifier_or_type_name
                 {
                         typedefTable.addToEnclosingScope2( *$5, TypedefTable::ID );
@@ -1917 +1920 @@
         ;
 
-context_declaring_list:                                                                 // CFA
+trait_declaring_list:                                                                   // CFA
         type_specifier declarator
                 {
@@ -1923 +1926 @@
                         $$ = $2->addType( $1 );
                 }
-        | context_declaring_list pop ',' push declarator
+        | trait_declaring_list pop ',' push declarator
                 {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );