hopefully REALLY added recursive var res to API

RedCubeDev-ByteSpace · RedCubeDev-ByteSpace · commit 15c4e6b86bef · 2022-01-14T22:59:08.000+01:00
diff --git a/ReCT/CodeAnalysis/Binding/Binder.cs b/ReCT/CodeAnalysis/Binding/Binder.cs
@@ -169,6 +169,8 @@ public static BoundGlobalScope BindGlobalScope(bool isScript, BoundGlobalScope p
                     else
                     {
                         mainFunction = new FunctionSymbol("main", ImmutableArray<ParameterSymbol>.Empty, TypeSymbol.Void, null);
+						var bbs = new BoundBlockStatement(statements.ToImmutable());
+						mainFunction.block = bbs;
                     }
                 }
             }
@@ -209,7 +211,7 @@ public static BoundProgram BindProgram(bool isScript, BoundProgram previous, Bou
                     var loweredBody = Lowerer.Lower(fs, body);
 
 					fs.scope = ((BoundBlockStatement)body).Scope;
-					fs.block = (BoundBlockStatement)body;
+					fs.block = body;
 
                     if (fs.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                         Binder._diagnostics.ReportAllPathsMustReturn(fs.Declaration.Identifier.Location);
@@ -227,7 +229,7 @@ public static BoundProgram BindProgram(bool isScript, BoundProgram previous, Bou
                     var loweredBody = Lowerer.Lower(function, body);
 
 					function.scope = ((BoundBlockStatement)body).Scope;
-					function.block = (BoundBlockStatement)body;
+					function.block = body;
 
                     if (function.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                         Binder._diagnostics.ReportAllPathsMustReturn(function.Declaration.Identifier.Location);
@@ -244,7 +246,7 @@ public static BoundProgram BindProgram(bool isScript, BoundProgram previous, Bou
                 var loweredBody = Lowerer.Lower(function, body);
 				
 				function.scope = ((BoundBlockStatement)body).Scope;
-				function.block = (BoundBlockStatement)body;
+				function.block = body;
 
                 if (function.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                     Binder._diagnostics.ReportAllPathsMustReturn(function.Declaration.Identifier.Location);
diff --git a/ReCT/CodeAnalysis/Binding/BoundExpression.cs b/ReCT/CodeAnalysis/Binding/BoundExpression.cs
@@ -3,7 +3,7 @@
 
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal abstract class BoundExpression : BoundNode
+    public abstract class BoundExpression : BoundNode
     {
         public abstract TypeSymbol Type { get; }
     }
diff --git a/ReCT/CodeAnalysis/Binding/BoundForStatement.cs b/ReCT/CodeAnalysis/Binding/BoundForStatement.cs
@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundForStatement : BoundLoopStatement
+    public sealed class BoundForStatement : BoundLoopStatement
     {
         public BoundForStatement(BoundStatement variable, BoundExpression condition, BoundExpression action, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)
             : base(breakLabel, continueLabel)
diff --git a/ReCT/CodeAnalysis/Binding/BoundFromToStatement.cs b/ReCT/CodeAnalysis/Binding/BoundFromToStatement.cs
@@ -2,7 +2,7 @@
 
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundFromToStatement : BoundLoopStatement
+    public sealed class BoundFromToStatement : BoundLoopStatement
     {
         public BoundFromToStatement(VariableSymbol variable, BoundExpression lowerBound, BoundExpression upperBound, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)
             : base(breakLabel, continueLabel)
diff --git a/ReCT/CodeAnalysis/Binding/BoundIfStatement.cs b/ReCT/CodeAnalysis/Binding/BoundIfStatement.cs
@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundIfStatement : BoundStatement
+    public sealed class BoundIfStatement : BoundStatement
     {
         public BoundIfStatement(BoundExpression condition, BoundStatement thenStatement, BoundStatement elseStatement)
         {
diff --git a/ReCT/CodeAnalysis/Binding/BoundLabel.cs b/ReCT/CodeAnalysis/Binding/BoundLabel.cs
@@ -1,6 +1,6 @@
 ﻿namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundLabel
+    public sealed class BoundLabel
     {
         internal BoundLabel(string name)
         {
diff --git a/ReCT/CodeAnalysis/Binding/BoundLoopStatement.cs b/ReCT/CodeAnalysis/Binding/BoundLoopStatement.cs
@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal abstract class BoundLoopStatement : BoundStatement
+    public abstract class BoundLoopStatement : BoundStatement
     {
         protected BoundLoopStatement(BoundLabel breakLabel, BoundLabel continueLabel)
         {
diff --git a/ReCT/CodeAnalysis/Binding/BoundTryCatchStatement.cs b/ReCT/CodeAnalysis/Binding/BoundTryCatchStatement.cs
@@ -1,6 +1,6 @@
 ﻿namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundTryCatchStatement : BoundStatement
+    public sealed class BoundTryCatchStatement : BoundStatement
     {
         public BoundTryCatchStatement(BoundStatement normalStatement, BoundStatement exceptionStatement)
         {
diff --git a/ReCT/CodeAnalysis/Binding/BoundWhileStatement.cs b/ReCT/CodeAnalysis/Binding/BoundWhileStatement.cs
@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundWhileStatement : BoundLoopStatement
+    public sealed class BoundWhileStatement : BoundLoopStatement
     {
         public BoundWhileStatement(BoundExpression condition, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)
             : base(breakLabel, continueLabel)
diff --git a/ReCT/CodeAnalysis/Symbols/FunctionSymbol.cs b/ReCT/CodeAnalysis/Symbols/FunctionSymbol.cs
@@ -26,6 +26,6 @@ public sealed class FunctionSymbol : Symbol
         public ImmutableArray<ParameterSymbol> Parameters { get; }
         public TypeSymbol Type { get; }
 		public ReCT.CodeAnalysis.Binding.BoundScope scope;
-		public ReCT.CodeAnalysis.Binding.BoundBlockStatement block;
+		public ReCT.CodeAnalysis.Binding.BoundStatement block;
     }
 }
diff --git a/ReCT/bin/Debug/netstandard2.0/ReCT.dll b/ReCT/bin/Debug/netstandard2.0/ReCT.dll
diff --git a/ReCT/bin/Debug/netstandard2.0/ReCT.pdb b/ReCT/bin/Debug/netstandard2.0/ReCT.pdb
diff --git a/ReCT/obj/Debug/netstandard2.0/ReCT.dll b/ReCT/obj/Debug/netstandard2.0/ReCT.dll
diff --git a/ReCT/obj/Debug/netstandard2.0/ReCT.pdb b/ReCT/obj/Debug/netstandard2.0/ReCT.pdb
diff --git a/rctc/Program.cs b/rctc/Program.cs
@@ -629,6 +629,10 @@ static void ReturnCompilationData(Compilation compilation)
 			foreach(var variable in compilation.Variables)
 				CollectVariableData(ref variables, ref globals, variable);
 
+			// recursive megic
+			if (compilation.MainFunction != null && compilation.MainFunction.block != null && compilation.MainFunction.block is BoundBlockStatement bbs)
+				variables.AddRange(CollectVariablesInBlockRecursively(bbs, ref globals));
+
 			// function data
 			foreach(var fnc in compilation.Functions)
 				CollectFunctionData(ref functions, ref globals, fnc);
@@ -709,9 +713,9 @@ static void CollectFunctionData(ref List<ReCTFunction> functions, ref List<ReCTG
 			//		CollectVariableData(ref variables, ref globals, vr);
 			//}
 
-			if (fnc.block != null)
+			if (fnc.block != null && fnc.block is BoundBlockStatement bbs)
 			{
-				variables.AddRange(CollectVariablesInBlockRecursively(fnc.block, ref globals));
+				variables.AddRange(CollectVariablesInBlockRecursively(bbs, ref globals));
 			}
 
 			foreach(var param in fnc.Parameters)
@@ -727,16 +731,72 @@ static List<ReCTVariable> CollectVariablesInBlockRecursively(BoundBlockStatement
 		{
 			List<ReCTVariable> variables = new List<ReCTVariable>();
 
-			if (block.Scope == null) return variables;
+			if (block.Scope != null)
+			{
+				foreach(var vr in block.Scope.GetDeclaredVariables())
+					CollectVariableData(ref variables, ref globals, vr);
+			}
 
-			foreach(var vr in block.Scope.GetDeclaredVariables())
-				CollectVariableData(ref variables, ref globals, vr);
 
 			foreach(var statement in block.Statements)
-				if (statement is BoundBlockStatement newBlock)
+			{
+				switch(statement.Kind)
 				{
-					variables.AddRange(CollectVariablesInBlockRecursively(newBlock, ref globals));
+					case BoundNodeKind.BlockStatement:
+						var blockStatement = statement as BoundBlockStatement;
+						
+						if (blockStatement is BoundBlockStatement bbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(bbs, ref globals));
+
+						break;
+
+					case BoundNodeKind.IfStatement:
+						var ifStatement = statement as BoundIfStatement;
+						
+						if (ifStatement.ThenStatement is BoundBlockStatement ifbbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(ifbbs, ref globals));
+
+						break;
+
+					case BoundNodeKind.ForStatement:
+						var forStatement = statement as BoundForStatement;
+						
+						if (forStatement.Body is BoundBlockStatement forbbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(forbbs, ref globals));
+
+						break;
+
+					case BoundNodeKind.FromToStatement:
+						var fromToStatement = statement as BoundFromToStatement;
+						
+						if (fromToStatement.Body is BoundBlockStatement fromTobbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(fromTobbs, ref globals));
+
+						break;
+
+					case BoundNodeKind.WhileStatement:
+						var whileStatement = statement as BoundWhileStatement;
+						
+						if (whileStatement.Body is BoundBlockStatement whilebbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(whilebbs, ref globals));
+
+						break;
+
+					case BoundNodeKind.TryCatchStatement:
+						var tryCatchStatement = statement as BoundTryCatchStatement;
+						
+						if (tryCatchStatement.NormalStatement is BoundBlockStatement trybbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(trybbs, ref globals));
+
+						if (tryCatchStatement.ExceptionStatement is BoundBlockStatement catchbbs)
+							variables.AddRange(CollectVariablesInBlockRecursively(catchbbs, ref globals));
+
+						break;
+
+					default:
+						break;
 				}
+			}
 
 			return variables;
 		}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace ReCT.CodeAnalysis.Binding`
`5`	`5`	`{`
`6`		`- internal abstract class BoundExpression : BoundNode`
	`6`	`+ public abstract class BoundExpression : BoundNode`
`7`	`7`	`{`
`8`	`8`	`public abstract TypeSymbol Type { get; }`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal sealed class BoundForStatement : BoundLoopStatement`
	`3`	`+ public sealed class BoundForStatement : BoundLoopStatement`
`4`	`4`	`{`
`5`	`5`	`public BoundForStatement(BoundStatement variable, BoundExpression condition, BoundExpression action, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)`
`6`	`6`	`: base(breakLabel, continueLabel)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace ReCT.CodeAnalysis.Binding`
`4`	`4`	`{`
`5`		`- internal sealed class BoundFromToStatement : BoundLoopStatement`
	`5`	`+ public sealed class BoundFromToStatement : BoundLoopStatement`
`6`	`6`	`{`
`7`	`7`	`public BoundFromToStatement(VariableSymbol variable, BoundExpression lowerBound, BoundExpression upperBound, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)`
`8`	`8`	`: base(breakLabel, continueLabel)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal sealed class BoundIfStatement : BoundStatement`
	`3`	`+ public sealed class BoundIfStatement : BoundStatement`
`4`	`4`	`{`
`5`	`5`	`public BoundIfStatement(BoundExpression condition, BoundStatement thenStatement, BoundStatement elseStatement)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal sealed class BoundLabel`
	`3`	`+ public sealed class BoundLabel`
`4`	`4`	`{`
`5`	`5`	`internal BoundLabel(string name)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal abstract class BoundLoopStatement : BoundStatement`
	`3`	`+ public abstract class BoundLoopStatement : BoundStatement`
`4`	`4`	`{`
`5`	`5`	`protected BoundLoopStatement(BoundLabel breakLabel, BoundLabel continueLabel)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal sealed class BoundTryCatchStatement : BoundStatement`
	`3`	`+ public sealed class BoundTryCatchStatement : BoundStatement`
`4`	`4`	`{`
`5`	`5`	`public BoundTryCatchStatement(BoundStatement normalStatement, BoundStatement exceptionStatement)`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace ReCT.CodeAnalysis.Binding`
`2`	`2`	`{`
`3`		`- internal sealed class BoundWhileStatement : BoundLoopStatement`
	`3`	`+ public sealed class BoundWhileStatement : BoundLoopStatement`
`4`	`4`	`{`
`5`	`5`	`public BoundWhileStatement(BoundExpression condition, BoundStatement body, BoundLabel breakLabel, BoundLabel continueLabel)`
`6`	`6`	`: base(breakLabel, continueLabel)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ public sealed class FunctionSymbol : Symbol`
`26`	`26`	`public ImmutableArray<ParameterSymbol> Parameters { get; }`
`27`	`27`	`public TypeSymbol Type { get; }`
`28`	`28`	`public ReCT.CodeAnalysis.Binding.BoundScope scope;`
`29`		`- public ReCT.CodeAnalysis.Binding.BoundBlockStatement block;`
	`29`	`+ public ReCT.CodeAnalysis.Binding.BoundStatement block;`
`30`	`30`	`}`
`31`	`31`	`}`