Merge branch 'master' of https://github.com/eigerproject/eigercs

eigerproject · Aug 21, 2024 · 49701f4 · 49701f4
2 parents 39e2bf7 + 51b8777
commit 49701f4
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,8 @@
       let name
       let surname
 
-      func Person(name, surname)
+      ~ constructor
+      func new(name, surname)
           this.name = name
           this.surname = surname
       end

diff --git a/eiger.Tests/EigerTests.cs b/eiger.Tests/EigerTests.cs
@@ -137,7 +137,7 @@ public void OOPInlineTest()
             "class Person\n" +
             "    let name" +
             "    let surname" +
-            "    func Person(name, surname)\n" +
+            "    func new(name, surname)\n" +
             "        this.name = name\n" +
             "        this.surname = surname\n" +
             "    end\n" +
@@ -158,7 +158,7 @@ public void OOPClassTests()
             "class Person\n" +
             "    let name" +
             "    let surname" +
-            "    func Person(name, surname)\n" +
+            "    func new(name, surname)\n" +
             "        this.name = name\n" +
             "        this.surname = surname\n" +
             "    end\n" +

diff --git a/eiger/Execution/BuiltInTypes/Class.cs b/eiger/Execution/BuiltInTypes/Class.cs
@@ -10,6 +10,8 @@ public class Class : Value
 
     public Class(string filename, int line, int pos, string name, Dictionary<string, Value> symbolTable, ASTNode blockNode) : base(filename, line, pos)
     {
+        if (name == "new")
+            throw new EigerLang.Errors.EigerError(filename, line, pos, "`new` is an invalid name for a class", Errors.EigerError.ErrorType.RuntimeError);
         this.filename = filename;
         this.line = line;
         this.pos = pos;
@@ -31,7 +33,7 @@ public Class(string filename, int line, int pos, string name, Dictionary<string,
 
         localSymbolTable = Interpreter.GetDictionaryDifference(symbolTable, localSymbolTable);
 
-        if (localSymbolTable.TryGetValue(name, out Value value))
+        if (localSymbolTable.TryGetValue("new", out Value value))
             if (value is Function constructorFunc)
                 constructorFunc.Execute(args, line, pos, filename);
 

diff --git a/eiger/Execution/BuiltInTypes/Value.cs b/eiger/Execution/BuiltInTypes/Value.cs
@@ -3,11 +3,11 @@
 
 namespace EigerLang.Execution.BuiltInTypes;
 
-public class Value(string filename, int line, int pos)
+public class Value(string _filename, int _line, int _pos)
 {
     public bool isReadonly = false;
-    public string filename;
-    public int line, pos;
+    public string filename = _filename;
+    public int line = _line, pos = _pos;
 
     public virtual Value AddedTo(object other)
     {
@@ -50,11 +50,17 @@ public virtual Value Negative()
 
     public virtual Boolean ComparisonEqeq(object other)
     {
+        if (other is Nix)
+            return new Boolean(filename, line, pos, this is Nix);
+
         throw new EigerError(filename, line, pos, $"{Globals.InvalidOperationStr}: {this.GetType().Name} ?= {other.GetType().Name}", EigerError.ErrorType.InvalidOperationError);
     }
 
     public virtual Boolean ComparisonNeqeq(object other)
     {
+        if (other is Nix)
+            return new Boolean(filename, line, pos, this is not Nix);
+
         throw new EigerError(filename, line, pos, $"{Globals.InvalidOperationStr}: {this.GetType().Name} != {other.GetType().Name}", EigerError.ErrorType.InvalidOperationError);
     }
 

diff --git a/eiger/Execution/Interpreter.cs b/eiger/Execution/Interpreter.cs
@@ -355,6 +355,10 @@ public static (bool, bool, Value) VisitBlockNode(ASTNode node, Dictionary<string
         // get function name
         string funcName = node.value ?? "";
 
+        // a symbol with that name already exists
+        if (symbolTable.ContainsKey(funcName) && funcName != "")
+            throw new EigerError(node.filename, node.line, node.pos, $"{funcName} already declared", EigerError.ErrorType.RuntimeError);
+
         // get funciton body
         ASTNode root = node.children[0];
 
@@ -390,6 +394,9 @@ public static (bool, bool, Value) VisitBlockNode(ASTNode node, Dictionary<string
         // get function name
         string funcName = node.value ?? "";
 
+        if (symbolTable.ContainsKey(funcName) && funcName != "")
+            throw new EigerError(node.filename, node.line, node.pos, $"{funcName} already declared", EigerError.ErrorType.RuntimeError);
+
         // get funciton body
         ASTNode root = node.children[0];
 
@@ -405,8 +412,14 @@ public static (bool, bool, Value) VisitBlockNode(ASTNode node, Dictionary<string
             argnames.Add(node.children[i].value);
         }
 
+        InlineFunction f = new InlineFunction(node, funcName, argnames, root, symbolTable);
+
+        // add the function to the current scope
+        if (funcName != "")
+            symbolTable[funcName] = f;
+
         // return the function
-        return (false, false, new InlineFunction(node, funcName, argnames, root, symbolTable));
+        return (false, false, f);
     }
 
     // visit unary operator node
@@ -727,12 +740,12 @@ public static void SetSymbol(Dictionary<string, Value> symbolTable, ASTNode key,
             }
             else
             {
-                throw new EigerError(key.filename, key.line, key.pos, "Assignee must be identifier", EigerError.ErrorType.RuntimeError);
+                throw new EigerError(key.filename, key.line, key.pos, "Left side of assignment is invalid", EigerError.ErrorType.RuntimeError);
             }
         }
         catch (KeyNotFoundException)
         {
-            throw new EigerError(key.filename, key.line, key.pos, $"Variable is undefined", EigerError.ErrorType.RuntimeError);
+            throw new EigerError(key.filename, key.line, key.pos, "Variable is undefined", EigerError.ErrorType.RuntimeError);
         }
     }
 }
diff --git a/eiger/Program.cs b/eiger/Program.cs
@@ -81,23 +81,26 @@ public static void Execute(string src, string fn, bool printExprs)
                 (bool shouldBreak, bool didReturn, Value val) = Interpreter.VisitNode(statement, Interpreter.globalSymbolTable);
                 if (printExprs)
                 {
+                    string v = Convert.ToString(val) ?? "";
                     switch (val.GetType().Name)
                     {
                         case "Number":
+                        case "Boolean":
                             Console.ForegroundColor = ConsoleColor.Cyan; break;
                         case "String":
-                            Console.ForegroundColor = ConsoleColor.Yellow; break;
+                            Console.ForegroundColor = ConsoleColor.Yellow; v = $"\"{v}\""; break;
                         case "Nix":
                             Console.ForegroundColor = ConsoleColor.DarkGray; break;
                         case "Function":
+                        case "InlineFunction":
                         case "Class":
                         case "Instance":
                         case "Dataclass":
                             Console.ForegroundColor = ConsoleColor.Green; break;
                         default:
                             Console.ResetColor(); break;
                     }
-                    Console.WriteLine(Convert.ToString(val));
+                    Console.WriteLine(v);
                     Console.ResetColor();
                 }
             }