Changeset d191e24 for src/Parser

Timestamp:

Oct 19, 2022, 5:29:12 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

bc899d6

Parents:

82ff4ed1 (diff), 058ece2 (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) (1 diff)
• ExpressionNode.cc (modified) (1 diff)
• ParseNode.h (modified) (2 diffs)
• TypeData.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -297 +297 @@
         } // if
 } // DeclarationNode::newEnumValueGeneric
+
+DeclarationNode * DeclarationNode::newEnumInLine( const string name ) {
+        DeclarationNode * newnode = newName( new std::string(name) );
+        newnode->enumInLine = true;
+        return newnode;
+}
 
 DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {

src/Parser/ExpressionNode.cc

@@ -523 +523 @@
                 auto enumInst = new EnumInstType( Type::Qualifiers(), e );
                 auto obj = new ObjectDecl( name->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, enumInst, nullptr );
-                ret->set_var( obj );
         }
         return ret;

src/Parser/ParseNode.h

@@ -240 +240 @@
         static DeclarationNode * newEnumConstant( const std::string * name, ExpressionNode * constant );
         static DeclarationNode * newEnumValueGeneric( const std::string * name, InitializerNode * init );
+        static DeclarationNode * newEnumInLine( const std::string name );
         static DeclarationNode * newName( const std::string * );
         static DeclarationNode * newFromTypeGen( const std::string *, ExpressionNode * params );
@@ -339 +340 @@
 
         bool inLine = false;
+        bool enumInLine = false; 
         Type::FuncSpecifiers funcSpecs;
         Type::StorageClasses storageClasses;

src/Parser/TypeData.cc

@@ -924 +924 @@
         list< Declaration * >::iterator members = ret->get_members().begin();
         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() ) {
                         SemanticError( td->location, "Enumerator of enum(void) cannot have an explicit initializer value." );

src/Parser/parser.yy

@@ -2605 +2605 @@
                 { $$ = DeclarationNode::newEnumValueGeneric( $1, $2 ); }
         | INLINE type_name
-                { $$ = DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ); }
+                { $$ = DeclarationNode::newEnumInLine( *$2->type->symbolic.name ); }
         | enumerator_list ',' identifier_or_type_name enumerator_value_opt
                 { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( $3, $4 ) ); }