Changeset 62c6cfa for src/Parser

Timestamp:

Sep 23, 2023, 10:50:18 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

c7616dd

Parents:

deda7e6

Message:

Revert "Fix designator value in enumerated array and implemented enumerated array with inlined enume declaration"

This reverts commit c1e66d966aadf6846330871033458d4a398bd576.

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• DeclarationNode.h (modified) (1 diff)
• TypeData.cc (modified) (1 diff)
• TypeData.h (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -394 +394 @@
         return newnode->addQualifiers( qualifiers );
 } // DeclarationNode::newArray
-
-DeclarationNode * DeclarationNode::newInlineEnumeratedArray( DeclarationNode * enumDecl, DeclarationNode * qualifiers ) {
-        DeclarationNode * newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Array );
-        newnode->type->array.isStatic = false;
-        newnode->type->array.isVarLen = false;
-
-        if ( enumDecl ) {
-                newnode->type->declType = enumDecl->type;
-                enumDecl->type = nullptr;
-                delete enumDecl;
-        } // if
-        
-        return newnode->addQualifiers( qualifiers );
-}
 
 DeclarationNode * DeclarationNode::newVarArray( DeclarationNode * qualifiers ) {

src/Parser/DeclarationNode.h

@@ -66 +66 @@
         static DeclarationNode * newPointer( DeclarationNode * qualifiers, OperKinds kind );
         static DeclarationNode * newArray( ExpressionNode * size, DeclarationNode * qualifiers, bool isStatic );
-        static DeclarationNode * newInlineEnumeratedArray( DeclarationNode * enumDecl, DeclarationNode * qualifiers );
         static DeclarationNode * newVarArray( DeclarationNode * qualifiers );
         static DeclarationNode * newBitfield( ExpressionNode * size );

src/Parser/TypeData.cc

@@ -1021 +1021 @@
                 );
         } // if
-        if ( td->declType) {
-                at->declaredType = buildEnum( td->declType, std::vector<ast::ptr<ast::Attribute>>(), ast::Linkage::Cforall );
-        }
         return at;
 } // buildArray

src/Parser/TypeData.h

@@ -85 +85 @@
         Kind kind;
         TypeData * base;
-        TypeData * declType;
         DeclarationNode::BasicType basictype = DeclarationNode::NoBasicType;
         DeclarationNode::ComplexType complextype = DeclarationNode::NoComplexType;

src/Parser/parser.yy

@@ -3855 +3855 @@
         | '[' push array_type_list pop ']'                                      // CFA
                 { $$ = DeclarationNode::newArray( $3, nullptr, false ); }
-        | '[' push INLINE enum_type_nobody pop']'
-                {       
-                        $$ = DeclarationNode::newInlineEnumeratedArray( $4, nullptr ); 
-                }
         | multi_array_dimension
         ;