Changeset 407bde5

Timestamp:

Jun 6, 2018, 5:24:52 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

aaron-thesis, arm-eh, 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, with_gc

Children:

5c25eee

Parents:

25bca42

Message:

first attempt at nested types

File:

• src/Parser/parser.yy (modified) (8 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 Jun  4 22:22:04 2018
-// Update Count     : 3492
+// Last Modified On : Wed Jun  6 14:53:38 2018
+// Update Count     : 3522
 //
 
@@ -503 +503 @@
                 { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
-                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                // { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = nullptr; }
         | type_name '.' '[' field_list ']'                                      // CFA, nested type / tuple field selector
-                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                // { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
+                { $$ = nullptr; }
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
                 {
@@ -1300 +1302 @@
         ;
 
-KR_parameter_list_opt:                                                          // used to declare parameter types in K&R style functions
+KR_parameter_list_opt:                                                                  // used to declare parameter types in K&R style functions
         // empty
                 { $$ = nullptr; }
@@ -1790 +1792 @@
                 { $$ = DeclarationNode::newFromTypedef( $1 ); }
         | '.' TYPEDEFname
-                { $$ = DeclarationNode::newFromTypedef( $2 ); } // FIX ME
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | type_name '.' TYPEDEFname
-                { $$ = DeclarationNode::newFromTypedef( $3 ); } // FIX ME
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | typegen_name
         | '.' typegen_name
-                { $$ = $2; }                                                                    // FIX ME
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | type_name '.' typegen_name
-                { $$ = $3; }                                                                    // FIX ME
+                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -1822 +1824 @@
         aggregate_key attribute_list_opt '{' field_declaration_list_opt '}'
                 { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
+        | aggregate_key attribute_list_opt no_attr_identifier
                 {
                         typedefTable.makeTypedef( *$3 );                        // create typedef
@@ -1830 +1832 @@
           '{' field_declaration_list_opt '}'
                 { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt type_name
+                {
+                        typedefTable.makeTypedef( *$3->type->symbolic.name ); // create typedef
+                        if ( forall ) typedefTable.changeKind( *$3->type->symbolic.name, TYPEGENname ); // possibly update
+                        forall = false;                                                         // reset
+                }
+          '{' field_declaration_list_opt '}'
+                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, nullptr, $6, true )->addQualifiers( $2 ); }
         | aggregate_key attribute_list_opt '(' type_list ')' '{' field_declaration_list_opt '}' // CFA
                 { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $4, $7, false )->addQualifiers( $2 ); }
@@ -1843 +1853 @@
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
                 }
-        | aggregate_key attribute_list_opt TYPEDEFname
-                {
-                        typedefTable.makeTypedef( *$3 );
-                        $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
-                }
-        | aggregate_key attribute_list_opt typegen_name         // CFA
+        | aggregate_key attribute_list_opt type_name
                 {
                         // Create new generic declaration with same name as previous forward declaration, where the IDENTIFIER is
@@ -1943 +1948 @@
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( new string( DeclarationNode::anonymous.newName() ), $4, true )->addQualifiers( $2 ); }
-        | ENUM attribute_list_opt no_attr_identifier_or_type_name
+        | ENUM attribute_list_opt no_attr_identifier
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
+        | ENUM attribute_list_opt type_name
+          '{' enumerator_list comma_opt '}'
+                { $$ = DeclarationNode::newEnum( $3->type->symbolic.name, $5, true )->addQualifiers( $2 ); }
         | enum_type_nobody
         ;
 
 enum_type_nobody:                                                                               // enum - {...}
-        ENUM attribute_list_opt no_attr_identifier_or_type_name
+        ENUM attribute_list_opt no_attr_identifier
                 {
                         typedefTable.makeTypedef( *$3 );
                         $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
+                }
+        | ENUM attribute_list_opt type_name
+                {
+                        typedefTable.makeTypedef( *$3->type->symbolic.name );
+                        $$ = DeclarationNode::newEnum( $3->type->symbolic.name, 0, false )->addQualifiers( $2 );
                 }
         ;