hopefully added recursive var resolving to the api

Author: RedCubeDev-ByteSpace

ReCT/CodeAnalysis/Binding/Binder.cs

@@ -209,6 +209,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;
 
                     if (fs.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                         Binder._diagnostics.ReportAllPathsMustReturn(fs.Declaration.Identifier.Location);
@@ -226,6 +227,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;
 
                     if (function.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                         Binder._diagnostics.ReportAllPathsMustReturn(function.Declaration.Identifier.Location);
@@ -242,6 +244,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;
 
                 if (function.Type != TypeSymbol.Void && !ControlFlowGraph.AllPathsReturn(loweredBody))
                     Binder._diagnostics.ReportAllPathsMustReturn(function.Declaration.Identifier.Location);

ReCT/CodeAnalysis/Binding/BoundBlockStatement.cs

@@ -3,7 +3,7 @@
 
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal sealed class BoundBlockStatement : BoundStatement
+    public sealed class BoundBlockStatement : BoundStatement
     {
         public BoundBlockStatement(ImmutableArray<BoundStatement> statements, BoundScope scope = null)
         {

ReCT/CodeAnalysis/Binding/BoundNode.cs

@@ -2,7 +2,7 @@
 
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal abstract class BoundNode
+    public abstract class BoundNode
     {
         public abstract BoundNodeKind Kind { get; }
 

ReCT/CodeAnalysis/Binding/BoundNodeKind.cs

@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal enum BoundNodeKind
+    public enum BoundNodeKind
     {
         // Statements
         BlockStatement,

ReCT/CodeAnalysis/Binding/BoundStatement.cs

@@ -1,6 +1,6 @@
 namespace ReCT.CodeAnalysis.Binding
 {
-    internal abstract class BoundStatement : BoundNode
+    public abstract class BoundStatement : BoundNode
     {
     }
 }

ReCT/CodeAnalysis/Symbols/FunctionSymbol.cs

@@ -26,5 +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;
     }
 }

rctc/Program.cs

@@ -703,10 +703,15 @@ static void CollectFunctionData(ref List<ReCTFunction> functions, ref List<ReCTG
 			List<ReCTVariable> variables = new List<ReCTVariable>();
 			List<ReCTVariable> parameters = new List<ReCTVariable>();
 
-			if (fnc.scope != null)
+			//if (fnc.scope != null)
+			//{
+			//	foreach(var vr in fnc.scope.GetDeclaredVariables())
+			//		CollectVariableData(ref variables, ref globals, vr);
+			//}
+
+			if (fnc.block != null)
 			{
-				foreach(var vr in fnc.scope.GetDeclaredVariables())
-					CollectVariableData(ref variables, ref globals, vr);
+				variables.AddRange(CollectVariablesInBlockRecursively(fnc.block, ref globals));
 			}
 
 			foreach(var param in fnc.Parameters)
@@ -718,6 +723,23 @@ static void CollectFunctionData(ref List<ReCTFunction> functions, ref List<ReCTG
 			function.Parameters = parameters.ToArray();
 			functions.Add(function);
 		}
+		static List<ReCTVariable> CollectVariablesInBlockRecursively(BoundBlockStatement block, ref List<ReCTGlobal> globals)
+		{
+			List<ReCTVariable> variables = new List<ReCTVariable>();
+
+			if (block.Scope == null) return variables;
+
+			foreach(var vr in block.Scope.GetDeclaredVariables())
+				CollectVariableData(ref variables, ref globals, vr);
+
+			foreach(var statement in block.Statements)
+				if (statement is BoundBlockStatement newBlock)
+				{
+					variables.AddRange(CollectVariablesInBlockRecursively(newBlock, ref globals));
+				}
+
+			return variables;
+		}
 
 		static void CollectClassData(ref List<ReCTClass> classes, ref List<ReCTGlobal> globals, ClassSymbol cls)
 		{