Changeset e874605 for src/Parser

Timestamp:

Oct 28, 2022, 3:11:57 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

93d2219

Parents:

77de429

Message:

Add class InlineValueDecl?, which is a Declaration class that works as a placeholder for aggregration value inherited from other aggregration. Disable inline value overwrite.

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• ExpressionNode.cc (modified) (1 diff)
• TypeData.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc ¶

@@ -27 +27 @@
 #include "SynTree/LinkageSpec.h"   // for Spec, linkageName, Cforall
 #include "SynTree/Attribute.h"     // for Attribute
-#include "SynTree/Declaration.h"   // for TypeDecl, ObjectDecl, Declaration
+#include "SynTree/Declaration.h"   // for TypeDecl, ObjectDecl, InlineValueDecl, Declaration
 #include "SynTree/Expression.h"    // for Expression, ConstantExpr
 #include "SynTree/Statement.h"     // for AsmStmt
@@ -1165 +1165 @@
                 SemanticError( this, "invalid function specifier for " );
         } // if
+        if ( enumInLine ) {
+                return new InlineValueDecl( *name, storageClasses, linkage, nullptr );
+        } // if
         assertf( name, "ObjectDecl must a have name\n" );
         return (new ObjectDecl( *name, storageClasses, linkage, maybeBuild< Expression >( bitfieldWidth ), nullptr, maybeBuild< Initializer >( initializer ) ))->set_asmName( asmName )->set_extension( extension );

src/Parser/ExpressionNode.cc ¶

@@ -519 +519 @@
                 }
         }
-        auto ret =  new QualifiedNameExpr( newDecl, name->name );
-        if ( auto e = dynamic_cast<EnumDecl*>(newDecl) ) {
-                auto enumInst = new EnumInstType( Type::Qualifiers(), e );
-                auto obj = new ObjectDecl( name->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, enumInst, nullptr );
-        }
-        return ret;
+        return new QualifiedNameExpr( newDecl, name->name );
 }
 

src/Parser/TypeData.cc ¶

@@ -925 +925 @@
         for ( const DeclarationNode * cur = td->enumeration.constants; cur != nullptr; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ), ++members ) {
                 if ( cur->enumInLine ) {
-                        // Tell the compiler this is a inline value placeholder
-                        ObjectDecl * member = dynamic_cast< ObjectDecl* >(* members);
-                        member->enumInLine = true;
-                }
-                if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
+                        // Do Nothing
+                } else if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
                         SemanticError( td->location, "Enumerator of enum(void) cannot have an explicit initializer value." );
                 } else if ( cur->has_enumeratorValue() ) {