bugfix code generation of defer block in loop expression

sekiguchi-nagisa · Sep 8, 2023 · aaccf0b · aaccf0b
1 parent a851d4c
commit aaccf0b
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -104,6 +104,7 @@
 - option parsing of builtin echo command
 - fix common super type resolution that have unresolved type
 - common prefix resolution of completion candidates that having multi-bytes characters
+- fix code generation of defer block in loop expression
 
 ## [0.30.0] - 2023-07-01
 

diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -1341,6 +1341,7 @@ void ByteCodeGenerator::visitJumpNode(JumpNode &node) {
   switch (node.getOpKind()) {
   case JumpNode::BREAK:
   case JumpNode::CONTINUE:
+  case JumpNode::IMPLICIT_CONTINUE:
     this->generateBreakContinue(node);
     break;
   case JumpNode::THROW: {

diff --git a/src/node.cpp b/src/node.cpp
@@ -656,6 +656,10 @@ LoopNode::LoopNode(unsigned int startPos, std::unique_ptr<Node> &&initNode,
     this->iterNode = std::make_unique<EmptyNode>();
   }
 
+  if (this->blockNode->getNodes().empty() || !isa<JumpNode>(*this->blockNode->getNodes().back())) {
+    this->blockNode->addNode(JumpNode::newContinue({0, 0}, false));
+  }
+
   this->updateToken(this->asDoWhile ? this->condNode->getToken() : this->blockNode->getToken());
 }
 
@@ -759,6 +763,7 @@ void JumpNode::dump(NodeDumper &dumper) const {
 #define EACH_ENUM(OP)                                                                              \
   OP(BREAK)                                                                                        \
   OP(CONTINUE)                                                                                     \
+  OP(IMPLICIT_CONTINUE)                                                                            \
   OP(THROW)                                                                                        \
   OP(RETURN)                                                                                       \
   OP(RETURN_INIT)

diff --git a/src/node.h b/src/node.h
@@ -1927,6 +1927,7 @@ class JumpNode : public WithRtti<Node, NodeKind::Jump> {
   enum OpKind : unsigned char {
     BREAK,
     CONTINUE,
+    IMPLICIT_CONTINUE, // for loop end without explicit continue
     THROW,
     RETURN,
     RETURN_INIT, // for constructor
@@ -1946,8 +1947,9 @@ class JumpNode : public WithRtti<Node, NodeKind::Jump> {
     return std::unique_ptr<JumpNode>(new JumpNode(token, BREAK, std::move(exprNode)));
   }
 
-  static std::unique_ptr<JumpNode> newContinue(Token token) {
-    return std::unique_ptr<JumpNode>(new JumpNode(token, CONTINUE, nullptr));
+  static std::unique_ptr<JumpNode> newContinue(Token token, bool explicitContinue = true) {
+    return std::unique_ptr<JumpNode>(
+        new JumpNode(token, explicitContinue ? CONTINUE : IMPLICIT_CONTINUE, nullptr));
   }
 
   /**

diff --git a/src/type_checker.cpp b/src/type_checker.cpp
@@ -265,7 +265,10 @@ void TypeChecker::checkTypeWithCurrentScope(const DSType *requiredType, BlockNod
   for (auto iter = blockNode.refNodes().begin(); iter != blockNode.refNodes().end(); ++iter) {
     auto &targetNode = *iter;
     if (blockType->isNothingType()) {
-      this->reportError<Unreachable>(*targetNode);
+      if (!isa<JumpNode>(*targetNode) ||
+          cast<JumpNode>(*targetNode).getOpKind() != JumpNode::IMPLICIT_CONTINUE) {
+        this->reportError<Unreachable>(*targetNode);
+      }
     }
 
     // type check
@@ -1243,14 +1246,6 @@ void TypeChecker::visitLoopNode(LoopNode &node) {
     blockNode.setBaseIndex(baseIndex + 1);
     blockNode.setVarSize(varSize - 1);
   }
-
-  if (!node.getBlockNode().getType().isNothingType()) { // insert continue to block end
-    auto jumpNode = JumpNode::newContinue({0, 0});
-    jumpNode->setType(this->typePool().get(TYPE::Nothing));
-    jumpNode->getExprNode().setType(this->typePool().get(TYPE::Void));
-    node.getBlockNode().setType(jumpNode->getType());
-    node.getBlockNode().addNode(std::move(jumpNode));
-  }
 }
 
 void TypeChecker::resolveIfLet(IfNode &node) {
@@ -1778,6 +1773,7 @@ void TypeChecker::visitJumpNode(JumpNode &node) {
   switch (node.getOpKind()) {
   case JumpNode::BREAK:
   case JumpNode::CONTINUE:
+  case JumpNode::IMPLICIT_CONTINUE:
     this->checkTypeAsBreakContinue(node);
     break;
   case JumpNode::THROW:

diff --git a/test/exec/cases/base/defer1.ds b/test/exec/cases/base/defer1.ds
@@ -73,4 +73,22 @@ var ii = new Interval(10,20)
 assert $ii.begin == 10
 assert $ii.end == 20
 
-assert "$(new Interval(10, 20))" == $'10010\n10 ~~ 20'
+assert "$(new Interval(10, 20))" == $'10010\n10 ~~ 20'
+
+## defer in loop
+var o = "$(
+for(var i = 0; $i < 5; $i++) {
+    defer { echo defer: $i; }
+    echo enter: $i
+}
+)" 
+assert $o == "enter: 0
+defer: 0
+enter: 1
+defer: 1
+enter: 2
+defer: 2
+enter: 3
+defer: 3
+enter: 4
+defer: 4" : $o
diff --git a/test/node/node_test.cpp b/test/node/node_test.cpp
@@ -882,7 +882,7 @@ static constexpr NodeDumpParam paramTable[] = {
             pos: 0
             size: 0
           type: "Nothing"
-          opKind: "CONTINUE"
+          opKind: "IMPLICIT_CONTINUE"
           fieldOffset: 0
           fieldSize: 0
           tryDepth: 0