Remove intermediate AST StmtNode (#439)

spicelang · Jan 20, 2024 · 2fd307c · 2fd307c
1 parent 8b5befb
commit 2fd307c
Show file tree

Hide file tree

Showing 18 changed files with 233 additions and 362 deletions.
diff --git a/media/test-project/test.spice b/media/test-project/test.spice
@@ -1,16 +1,9 @@
-import "std/data/vector";
+f<string> unusedReturnValue() {
+    return "unused";
+}
 
 f<int> main() {
-    Vector<string> v = Vector<string>();
-    v.pushBack("Hello");
-    v.pushBack("World");
-    v.pushBack("!");
-    v.pushBack("!");
-    v.pushBack("!");
-
-    foreach string s : v {
-        printf("%s\n", s);
-    }
+    unusedReturnValue();
 }
 
 /*f<int> main() {

diff --git a/src/ast/ASTBuilder.cpp b/src/ast/ASTBuilder.cpp
@@ -475,14 +475,7 @@ std::any ASTBuilder::visitSignature(SpiceParser::SignatureContext *ctx) {
   return concludeNode(signatureNode);
 }
 
-std::any ASTBuilder::visitStmt(SpiceParser::StmtContext *ctx) {
-  auto stmtNode = createNode<StmtNode>(ctx);
-
-  // Visit children
-  visitChildren(ctx);
-
-  return concludeNode(stmtNode);
-}
+std::any ASTBuilder::visitStmt(SpiceParser::StmtContext *ctx) { return visitChildren(ctx); }
 
 std::any ASTBuilder::visitDeclStmt(SpiceParser::DeclStmtContext *ctx) {
   auto declStmtNode = createNode<DeclStmtNode>(ctx);

diff --git a/src/ast/ASTNodes.cpp b/src/ast/ASTNodes.cpp
@@ -511,7 +511,7 @@ bool FctCallNode::hasReturnValueReceiver() const {
     node = node->parent;
   }
   // Also check the condition of the assign expression
-  return node->children.size() > 1 || !node->parent->isStmtNode();
+  return node->children.size() > 1 || !node->parent->isStmtLstNode();
 }
 
 bool LambdaFuncNode::returnsOnAllControlPaths(bool *overrideUnreachable) const {