Changeset 342af53 for src/Parser

Timestamp:

Jan 14, 2021, 12:23:14 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8e4aa05

Parents:

4468a70 (diff), ec19b21 (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

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ParseNode.h (modified) (2 diffs)
• parser.yy (modified) (9 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Oct  8 08:03:38 2020
-// Update Count     : 1135
+// Last Modified On : Mon Jan 11 20:58:07 2021
+// Update Count     : 1137
 //
 
@@ -1075 +1075 @@
         if ( variable.tyClass != TypeDecl::NUMBER_OF_KINDS ) {
                 // otype is internally converted to dtype + otype parameters
-                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype };
-                static_assert( sizeof(kindMap)/sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
+                static const TypeDecl::Kind kindMap[] = { TypeDecl::Dtype, TypeDecl::DStype, TypeDecl::Dtype, TypeDecl::Ftype, TypeDecl::Ttype, TypeDecl::ALtype };
+                static_assert( sizeof(kindMap) / sizeof(kindMap[0]) == TypeDecl::NUMBER_OF_KINDS, "DeclarationNode::build: kindMap is out of sync." );
                 assertf( variable.tyClass < sizeof(kindMap)/sizeof(kindMap[0]), "Variable's tyClass is out of bounds." );
                 TypeDecl * ret = new TypeDecl( *name, Type::StorageClasses(), nullptr, kindMap[ variable.tyClass ], variable.tyClass == TypeDecl::Otype, variable.initializer ? variable.initializer->buildType() : nullptr );

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct 24 03:53:54 2020
-// Update Count     : 895
+// Last Modified On : Sun Jan  3 18:23:01 2021
+// Update Count     : 896
 //
 
@@ -39 +39 @@
 struct DeclarationNode;
 class DeclarationWithType;
+class Initializer;
 class ExpressionNode;
-class Initializer;
 struct StatementNode;
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct 24 08:21:14 2020
-// Update Count     : 4624
+// Last Modified On : Mon Jan 11 21:32:10 2021
+// Update Count     : 4633
 //
 
@@ -329 +329 @@
 %type<en> conditional_expression                constant_expression                     assignment_expression           assignment_expression_opt
 %type<en> comma_expression                              comma_expression_opt
-%type<en> argument_expression_list_opt  argument_expression                     default_initialize_opt
+%type<en> argument_expression_list_opt  argument_expression                     default_initializer_opt
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression              for_control_expression_list
@@ -424 +424 @@
 %type<decl> sue_declaration_specifier sue_declaration_specifier_nobody sue_type_specifier sue_type_specifier_nobody
 
-%type<tclass> type_class
+%type<tclass> type_class new_type_class
 %type<decl> type_declarator type_declarator_name type_declaring_list
 
@@ -1545 +1545 @@
         | cfa_function_declaration
         | type_declaring_list
+                { SemanticError( yylloc, "otype declaration is currently unimplemented." ); $$ = nullptr; }
         | trait_specifier
         ;
@@ -2223 +2224 @@
         ;
 
-cfa_parameter_ellipsis_list_opt:                                                        // CFA, abstract + real
+cfa_parameter_ellipsis_list_opt:                                                // CFA, abstract + real
         // empty
                 { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
@@ -2280 +2281 @@
 cfa_parameter_declaration:                                                              // CFA, new & old style parameter declaration
         parameter_declaration
-        | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name default_initialize_opt
+        | cfa_identifier_parameter_declarator_no_tuple identifier_or_type_name default_initializer_opt
                 { $$ = $1->addName( $2 ); }
-        | cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | cfa_abstract_tuple identifier_or_type_name default_initializer_opt
                 // To obtain LR(1), these rules must be duplicated here (see cfa_abstract_declarator).
                 { $$ = $1->addName( $2 ); }
-        | type_qualifier_list cfa_abstract_tuple identifier_or_type_name default_initialize_opt
+        | type_qualifier_list cfa_abstract_tuple identifier_or_type_name default_initializer_opt
                 { $$ = $2->addName( $3 )->addQualifiers( $1 ); }
         | cfa_function_specifier
@@ -2302 +2303 @@
 parameter_declaration:
                 // No SUE declaration in parameter list.
-        declaration_specifier_nobody identifier_parameter_declarator default_initialize_opt
+        declaration_specifier_nobody identifier_parameter_declarator default_initializer_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
-        | declaration_specifier_nobody type_parameter_redeclarator default_initialize_opt
+        | declaration_specifier_nobody type_parameter_redeclarator default_initializer_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         ;
 
 abstract_parameter_declaration:
-        declaration_specifier_nobody default_initialize_opt
+        declaration_specifier_nobody default_initializer_opt
                 { $$ = $1->addInitializer( $2 ? new InitializerNode( $2 ) : nullptr ); }
-        | declaration_specifier_nobody abstract_parameter_declarator default_initialize_opt
+        | declaration_specifier_nobody abstract_parameter_declarator default_initializer_opt
                 { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         ;
@@ -2441 +2442 @@
         type_class identifier_or_type_name
                 { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
-        type_initializer_opt assertion_list_opt
+          type_initializer_opt assertion_list_opt
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
-        | type_specifier identifier_parameter_declarator
+        | identifier_or_type_name new_type_class
+                { typedefTable.addToScope( *$1, TYPEDEFname, "9" ); }
+          type_initializer_opt assertion_list_opt
+                { $$ = DeclarationNode::newTypeParam( $2, $1 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
+        | '[' identifier_or_type_name ']'
+                {
+                        typedefTable.addToScope( *$2, TYPEDEFname, "9" );
+                        $$ = DeclarationNode::newTypeParam( TypeDecl::ALtype, $2 );
+                }
+        // | type_specifier identifier_parameter_declarator
         | assertion_list
                 { $$ = DeclarationNode::newTypeParam( TypeDecl::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
+        ;
+
+new_type_class:                                                                                 // CFA
+        // empty
+                { $$ = TypeDecl::Otype; }
+        | '&'
+                { $$ = TypeDecl::Dtype; }
+        | '*'
+                { $$ = TypeDecl::DStype; }                                              // dtype + sized
+        | ELLIPSIS
+                { $$ = TypeDecl::Ttype; }
         ;
 
@@ -3476 +3497 @@
         ;
 
-default_initialize_opt:
+default_initializer_opt:
         // empty
                 { $$ = nullptr; }