(#72) Merge with main

ForNeVeR · Jul 23, 2022 · 204bb58 · 204bb58
1 parent b63171e
commit 204bb58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Cesium.Ast/Statements.cs b/Cesium.Ast/Statements.cs
@@ -29,11 +29,11 @@ public record ForStatement(
     Expression? InitExpression,
     Expression? TestExpression,
     Expression? UpdateExpression,
-    Statement Body) : Statement;
+    IBlockItem Body) : Statement;
 
 // 6.8.6 Jump statements
 public record GoToStatement(string Identifier) : Statement;
 
 public record BreakStatement : Statement;
 
-public record ReturnStatement(Expression Expression) : Statement;
+public record ReturnStatement(Expression Expression) : Statement;
diff --git a/Cesium.CodeGen/Ir/BlockItems/AmbiguousBlockItem.cs b/Cesium.CodeGen/Ir/BlockItems/AmbiguousBlockItem.cs
@@ -25,7 +25,7 @@ public AmbiguousBlockItem(Ast.AmbiguousBlockItem item)
 
     public IBlockItem Lower() => this;
 
-    public void EmitTo(FunctionScope scope)
+    public void EmitTo(IDeclarationScope scope)
     {
         // Check if this can be a valid variable declaration:
         var typeReference = scope.Context.GetTypeReference(_item1);
@@ -49,12 +49,12 @@ public void EmitTo(FunctionScope scope)
                 $" but it's ambiguous which it is, since both a function and a type of name {_item1} exist.");
     }
 
-    private void EmitVariableDeclaration(FunctionScope scope)
+    private void EmitVariableDeclaration(IDeclarationScope scope)
     {
         throw new NotImplementedException("Ambiguous variable declarations aren't supported, yet.");
     }
 
-    private void EmitFunctionCall(FunctionScope scope)
+    private void EmitFunctionCall(IDeclarationScope scope)
     {
         CToken CreateFakeToken(string id) => new(new Range(), id, new Range(), id, CTokenType.Identifier);
 

diff --git a/Cesium.Parser/CParser.cs b/Cesium.Parser/CParser.cs
@@ -723,7 +723,7 @@ private static ForStatement MakeForStatement(
         ICToken ____,
         Expression updateExpression,
         ICToken _____,
-        Statement body)
+        IBlockItem body)
         => new(initExpression, testExpression, updateExpression, body);
 
     // 6.8.6 Jump statements