Changeset 028e512

Timestamp:

Apr 19, 2023, 11:58:01 AM (12 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

45e753c

Parents:

a5ea261

Message:

Cleaned up some DeclarationNode? code that had some extra code no longer needed because of the translation. Also added a helper function for clarity.

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (2 diffs)
• DeclarationNode.h (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -1053 +1053 @@
                                         unionDecl = dynamic_cast<ast::UnionDecl *>( decl );
 
-                                        decl->location = cur->location;
                                         *out++ = decl;
 
@@ -1121 +1120 @@
                                                 } // if
                                         } // if
-                                        decl->location = cur->location;
                                         *out++ = decl;
                                 } // if

src/Parser/DeclarationNode.h

@@ -177 +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,
@@ -184 +192 @@
         SemanticErrorException errors;
         std::back_insert_iterator<Container<ast::ptr<AstType>, Args...>> out( output );
-        NodeType * cur = firstNode;
-
-        while ( cur ) {
+
+        for ( NodeType * cur = firstNode ; cur ; cur = strict_next( cur ) ) {
                 try {
-                        if ( auto result = dynamic_cast<AstType *>( maybeBuild( cur ) ) ) {
-                                *out++ = result;
-                        } else {
-                                assertf(false, __PRETTY_FUNCTION__ );
-                                SemanticError( cur->location, "type specifier declaration in forall clause is currently unimplemented." );
-                        } // if
-                } catch( SemanticErrorException & e ) {
+                        AstType * node = dynamic_cast<AstType *>( maybeBuild( cur ) );
+                        assertf( node, "buildList: Did not build node of correct type." );
+                        *out++ = node;
+                } catch ( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
-                ParseNode * temp = cur->get_next();
-                // Should not return nullptr, then it is non-homogeneous:
-                cur = dynamic_cast<NodeType *>( temp );
-                if ( !cur && temp ) {
-                        SemanticError( temp->location, "internal error, non-homogeneous nodes founds in buildList processing." );
-                } // if
-        } // while
+        } // for
         if ( ! errors.isEmpty() ) {
                 throw errors;