Changes in src/Parser/DeclarationNode.h [af60383:4eb3a7c5]

File:

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

src/Parser/DeclarationNode.h

@@ -19 +19 @@
 
 struct TypeData;
-struct InitializerNode;
-
-struct DeclarationNode final : public ParseList<DeclarationNode> {
+class InitializerNode;
+
+struct DeclarationNode : public ParseNode {
         // 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;
@@ -125 +129 @@
         DeclarationNode * set_inLine( bool inL ) { inLine = inL; return this; }
 
-        const std::string * name = nullptr;
+        DeclarationNode * get_last() { return (DeclarationNode *)ParseNode::get_last(); }
 
         struct Variable_t {
@@ -140 +144 @@
         };
         StaticAssert_t assert;
+
+        BuiltinType builtin = NoBuiltinType;
 
         TypeData * type = nullptr;
@@ -171 +177 @@
 }
 
+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,
@@ -179 +193 @@
         std::back_insert_iterator<Container<ast::ptr<AstType>, Args...>> out( output );
 
-        for ( NodeType * cur = firstNode ; cur ; cur = cur->next ) {
+        for ( NodeType * cur = firstNode ; cur ; cur = strict_next( cur ) ) {
                 try {
                         AstType * node = dynamic_cast<AstType *>( maybeBuild( cur ) );