Changeset f6e8c67 for src/Parser/DeclarationNode.h

Timestamp:

Mar 6, 2024, 6:06:43 AM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

647d633

Parents:

bbf2cb1 (diff), af60383 (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

File:

• src/Parser/DeclarationNode.h (modified) (6 diffs)

src/Parser/DeclarationNode.h

@@ -19 +19 @@
 
 struct TypeData;
-class InitializerNode;
-
-struct DeclarationNode : public ParseNode {
+struct InitializerNode;
+
+struct DeclarationNode final : public ParseList<DeclarationNode> {
         // These enumerations must harmonize with their names in DeclarationNode.cc.
         enum BasicType {
@@ -108 +108 @@
         DeclarationNode * cloneBaseType( DeclarationNode * newdecl, bool = true );
 
-        DeclarationNode * appendList( DeclarationNode * node ) {
-                return (DeclarationNode *)set_last( node );
-        }
-
         virtual void print( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
         virtual void printList( __attribute__((unused)) std::ostream & os, __attribute__((unused)) int indent = 0 ) const override;
@@ -129 +125 @@
         DeclarationNode * set_inLine( bool inL ) { inLine = inL; return this; }
 
-        DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
+        const std::string * name = nullptr;
 
         struct Variable_t {
@@ -144 +140 @@
         };
         StaticAssert_t assert;
-
-        BuiltinType builtin = NoBuiltinType;
 
         TypeData * type = nullptr;
@@ -177 +171 @@
 }
 
-template<typename NodeType>
-NodeType * strict_next( NodeType * node ) {
-        ParseNode * next = node->get_next();
-        if ( nullptr == next ) return nullptr;
-        if ( NodeType * ret = dynamic_cast<NodeType *>( next ) ) return ret;
-        SemanticError( next->location, "internal error, non-homogeneous nodes founds in buildList processing." );
-}
-
 // This generic buildList is here along side its overloads.
 template<typename AstType, typename NodeType,
@@ -193 +179 @@
         std::back_insert_iterator<Container<ast::ptr<AstType>, Args...>> out( output );
 
-        for ( NodeType * cur = firstNode ; cur ; cur = strict_next( cur ) ) {
+        for ( NodeType * cur = firstNode ; cur ; cur = cur->next ) {
                 try {
                         AstType * node = dynamic_cast<AstType *>( maybeBuild( cur ) );