Changeset 6611177 for src/Parser/DeclarationNode.h

Timestamp:

Apr 11, 2023, 12:48:03 PM (14 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

5541a44e

Parents:

9921573

Message:

Clean-up in parser. ClauseNode? rework, plus internal adjustments to reduce extra code and unchecked casts.

File:

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

src/Parser/DeclarationNode.h

@@ -180 +180 @@
 template<typename AstType, typename NodeType,
     template<typename, typename...> class Container, typename... Args>
-void buildList( const NodeType * firstNode,
+void buildList( NodeType * firstNode,
         Container<ast::ptr<AstType>, Args...> & output ) {
     SemanticErrorException errors;
     std::back_insert_iterator<Container<ast::ptr<AstType>, Args...>> out( output );
-    const NodeType * cur = firstNode;
+    NodeType * cur = firstNode;
 
     while ( cur ) {
@@ -197 +197 @@
             errors.append( e );
         } // try
-        const ParseNode * temp = cur->get_next();
+        ParseNode * temp = cur->get_next();
         // Should not return nullptr, then it is non-homogeneous:
-        cur = dynamic_cast<const NodeType *>( temp );
+        cur = dynamic_cast<NodeType *>( temp );
         if ( !cur && temp ) {
             SemanticError( temp->location, "internal error, non-homogeneous nodes founds in buildList processing." );
@@ -209 +209 @@
 }
 
-void buildList( const DeclarationNode * firstNode, std::vector<ast::ptr<ast::Decl>> & outputList );
-void buildList( const DeclarationNode * firstNode, std::vector<ast::ptr<ast::DeclWithType>> & outputList );
+void buildList( DeclarationNode * firstNode, std::vector<ast::ptr<ast::Decl>> & outputList );
+void buildList( DeclarationNode * firstNode, std::vector<ast::ptr<ast::DeclWithType>> & outputList );
 void buildTypeList( const DeclarationNode * firstNode, std::vector<ast::ptr<ast::Type>> & outputList );
 
 template<typename AstType, typename NodeType,
 template<typename, typename...> class Container, typename... Args>
-void buildMoveList( const NodeType * firstNode,
-Container<ast::ptr<AstType>, Args...> & output ) {
-buildList<AstType, NodeType, Container, Args...>( firstNode, output );
-delete firstNode;
+void buildMoveList( NodeType * firstNode,
+                Container<ast::ptr<AstType>, Args...> & output ) {
+        buildList<AstType, NodeType, Container, Args...>( firstNode, output );
+        delete firstNode;
 }