Changeset b66d14a for src/Parser

Timestamp:

Jan 11, 2021, 10:10:33 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

20207c0

Parents:

2501ae5

Message:

add new type kinds DStype and ALtype

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• parser.yy (modified) (3 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/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 11 14:14:16 2021
-// Update Count     : 4630
+// Last Modified On : Mon Jan 11 21:32:10 2021
+// Update Count     : 4633
 //
 
@@ -2449 +2449 @@
                 { $$ = DeclarationNode::newTypeParam( $2, $1 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
         | '[' identifier_or_type_name ']'
-                { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
+                {
+                        typedefTable.addToScope( *$2, TYPEDEFname, "9" );
+                        $$ = DeclarationNode::newTypeParam( TypeDecl::ALtype, $2 );
+                }
         // | type_specifier identifier_parameter_declarator
         | assertion_list
@@ -2461 +2464 @@
                 { $$ = TypeDecl::Dtype; }
         | '*'
-                { $$ = TypeDecl::Dtype; }                                               // dtype + sized
+                { $$ = TypeDecl::DStype; }                                              // dtype + sized
         | ELLIPSIS
                 { $$ = TypeDecl::Ttype; }