Feature(compiler): Scope - support continueBlock

ovr · ovr · commit 4b5b7365cfbb · 2018-12-08T01:10:35.000+09:00
diff --git a/src/backend/llvm/code-generation/do-statement.ts b/src/backend/llvm/code-generation/do-statement.ts
@@ -17,12 +17,14 @@ export class DoStatementGenerator implements NodeGenerateInterface<ts.DoStatemen
         ctx.scope.enclosureFunction.llvmFunction.addBasicBlock(next);
 
         ctx.scope.breakBlock = next;
+        ctx.scope.continueBlock = conditionBlock;
 
         builder.createBr(positiveBlock);
         builder.setInsertionPoint(positiveBlock);
 
         passStatement(<any>node.statement, ctx, builder);
 
+        ctx.scope.breakBlock = null;
         ctx.scope.continueBlock = null;
 
         builder.createBr(conditionBlock);
diff --git a/src/backend/llvm/code-generation/for-statement.ts b/src/backend/llvm/code-generation/for-statement.ts
@@ -46,6 +46,7 @@ export class ForStatementGenerator implements NodeGenerateInterface<ts.ForStatem
         }
 
         ctx.scope.breakBlock = next;
+        ctx.scope.continueBlock = startBlock;
 
         builder.setInsertionPoint(bodyBlock);
         passStatement(node.statement, ctx, builder);
@@ -65,6 +66,7 @@ export class ForStatementGenerator implements NodeGenerateInterface<ts.ForStatem
         builder.createBr(startBlock);
 
         ctx.scope.breakBlock = null;
+        ctx.scope.continueBlock = null;
 
         builder.setInsertionPoint(next);
     }
diff --git a/src/backend/llvm/scope.ts b/src/backend/llvm/scope.ts
@@ -20,5 +20,6 @@ export class Scope {
     public enclosureFunction: EnclosureFunction;
     public functions: FunctionsTable = new FunctionsTable();
     public variables: VariablesTable = new VariablesTable();
-    public breakBlock: llvm.BasicBlock|null;
+    public breakBlock: llvm.BasicBlock|null = null;
+    public continueBlock: llvm.BasicBlock|null = null;
 }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ export class ForStatementGenerator implements NodeGenerateInterface<ts.ForStatem`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`ctx.scope.breakBlock = next;`
	`49`	`+ ctx.scope.continueBlock = startBlock;`
`49`	`50`
`50`	`51`	`builder.setInsertionPoint(bodyBlock);`
`51`	`52`	`passStatement(node.statement, ctx, builder);`
`@@ -65,6 +66,7 @@ export class ForStatementGenerator implements NodeGenerateInterface<ts.ForStatem`
`65`	`66`	`builder.createBr(startBlock);`
`66`	`67`
`67`	`68`	`ctx.scope.breakBlock = null;`
	`69`	`+ ctx.scope.continueBlock = null;`
`68`	`70`
`69`	`71`	`builder.setInsertionPoint(next);`
`70`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ export class Scope {`
`20`	`20`	`public enclosureFunction: EnclosureFunction;`
`21`	`21`	`public functions: FunctionsTable = new FunctionsTable();`
`22`	`22`	`public variables: VariablesTable = new VariablesTable();`
`23`		`- public breakBlock: llvm.BasicBlock\|null;`
	`23`	`+ public breakBlock: llvm.BasicBlock\|null = null;`
	`24`	`+ public continueBlock: llvm.BasicBlock\|null = null;`
`24`	`25`	`}`