fix: not being able to call function within itself

fixes #5
heir-lang · Jan 14, 2025 · 37f6807 · 37f6807
1 parent 0b91d7c
commit 37f6807
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 23 deletions.
diff --git a/Heir/Binder.cs b/Heir/Binder.cs
@@ -58,15 +58,27 @@ public BoundStatement VisitFunctionDeclaration(FunctionDeclaration functionDecla
         var parameterTypePairs = boundParameters.ConvertAll(parameter =>
             new KeyValuePair<string, BaseType>(parameter.Symbol.Name.Text, parameter.Type));
 
-        var boundBody = (BoundBlock)Bind(functionDeclaration.Body);
-        var type = new FunctionType(
-            new Dictionary<string, BaseType>(parameterTypePairs),
+        var parameterTypes = new Dictionary<string, BaseType>(parameterTypePairs);
+        var placeholderType = new FunctionType(
+            parameterTypes,
             functionDeclaration.ReturnType != null
                 ? BaseType.FromTypeRef(functionDeclaration.ReturnType)
-                : boundBody.Type
+                : new AnyType()
         );
 
-        var symbol = DefineSymbol(functionDeclaration.Name.Token, type, false);
+        var placeholderSymbol = DefineSymbol<BaseType>(functionDeclaration.Name.Token, placeholderType, false);
+        var boundBody = (BoundBlock)Bind(functionDeclaration.Body);
+        var returnType = functionDeclaration.ReturnType != null
+            ? BaseType.FromTypeRef(functionDeclaration.ReturnType)
+            : boundBody.Type;
+
+        var finalType = new FunctionType(
+            new Dictionary<string, BaseType>(parameterTypePairs),
+            returnType
+        );
+
+        UndefineSymbol(placeholderSymbol);
+        var symbol = DefineSymbol(functionDeclaration.Name.Token, finalType, false);
         return new BoundFunctionDeclaration(functionDeclaration.Keyword, symbol, boundParameters, boundBody);
     }
 
@@ -220,6 +232,16 @@ private VariableSymbol<TType> DefineSymbol<TType>(Token name, TType type, bool i
         return symbol;
     }
 
+    private void UndefineSymbol(VariableSymbol<BaseType> variableSymbol)
+    {
+        if (!_variableScopes.TryPop(out var scope)) return;
+
+        var newScope = scope.ToList();
+        newScope.Remove(variableSymbol);
+        _variableScopes.Push(new Stack<VariableSymbol<BaseType>>(newScope));
+    }
+
+
     private void BeginScope() => _variableScopes.Push([]);
     private Stack<VariableSymbol<BaseType>> EndScope() => _variableScopes.Pop();
 
@@ -251,14 +273,14 @@ private BoundSyntaxNode Bind(SyntaxNode node)
     private BoundStatement Bind(Statement statement)
     {
         var boundStatement = statement.Accept(this);
-        _boundNodes.Add(statement, boundStatement);
+        _boundNodes.TryAdd(statement, boundStatement);
         return boundStatement;
     }
 
     private BoundExpression Bind(Expression expression)
     {
         var boundExpression = expression.Accept(this);
-        _boundNodes.Add(expression, boundExpression);
+        _boundNodes.TryAdd(expression, boundExpression);
         return boundExpression;
     }
 }
diff --git a/Heir/Heir.csproj b/Heir/Heir.csproj
@@ -12,4 +12,8 @@
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Runtime\Intrinsics\" />
+  </ItemGroup>
+
 </Project>
diff --git a/Heir/Program.cs b/Heir/Program.cs
@@ -5,13 +5,13 @@
 var testFile = SourceFile.FromPath("./Test.heir", isMainFile: true);
 // Console.WriteLine(testFile.Tokenize().WithoutTrivia().ToString());
 // Console.WriteLine();
-var syntaxTree = testFile.Parse();
-syntaxTree.Display();
-Console.WriteLine();
+// var syntaxTree = testFile.Parse();
+// syntaxTree.Display();
+// Console.WriteLine();
 // testFile.Bind().GetBoundNode(syntaxTree).Display();
-//Console.WriteLine();
-//Console.WriteLine(testFile.GenerateBytecode().ToString());
-//Console.WriteLine();
+// Console.WriteLine();
+// Console.WriteLine(testFile.GenerateBytecode().ToString());
+// Console.WriteLine();
 program.LoadFile(testFile);
 
 var result = program.Evaluate();

diff --git a/Heir/SourceFile.cs b/Heir/SourceFile.cs
@@ -41,11 +41,17 @@ public static SourceFile FromPath(string path, bool isMainFile = false)
                 return (null, vm);
             }
 
-            var value = vm.Evaluate();
-            if (Diagnostics.Count <= 0)
-                return (IsMainFile ? value : null, vm);
+            try
+            {
+                var value = vm.Evaluate();
+                if (Diagnostics.Count <= 0)
+                    return (IsMainFile ? value : null, vm);
+            }
+            catch (Exception e)
+            {
+                WriteDiagnostics();
+            }
 
-            WriteDiagnostics();
             return (null, vm);
         }
 

diff --git a/Heir/VirtualMachine.cs b/Heir/VirtualMachine.cs
@@ -22,7 +22,7 @@ public sealed class VirtualMachine
     public Scope Scope { get; private set; }
     public int RecursionDepth { get; private set; }
 
-    private const int _maxRecursionDepth = 1000;
+    private const int _maxRecursionDepth = 300; // can only handle about this much for now 💀
     private readonly Stack<StackFrame> _stack = [];
     private readonly Bytecode _bytecode;
     private Scope _enclosingScope;
@@ -61,9 +61,9 @@ public VirtualMachine(Bytecode bytecode, Scope? scope = null, int recursionDepth
     public void EndRecursion(int level = 1) => RecursionDepth -= level;
     public void BeginRecursion(Token token)
     {
-        RecursionDepth++;
-        if (RecursionDepth < _maxRecursionDepth) return;
-        Diagnostics.Error(DiagnosticCode.H017, $"Stack overflow: Recursion depth of ${_maxRecursionDepth} exceeded", token);
+        if (RecursionDepth++ < _maxRecursionDepth) return;
+        Diagnostics.Error(DiagnosticCode.H017, $"Stack overflow: Recursion depth of {_maxRecursionDepth} exceeded", token);
+        throw new Exception();
     }
 
     private StackFrame? EvaluateInstruction(Instruction instruction)

diff --git a/Test.heir b/Test.heir
@@ -1,6 +1,5 @@
-let mut i = 0;
 fn abc {
-    return;
+    abc();
 }
 
 abc();