29 mocking for alfa

ALFA/.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/bin/Debug/net7.0/ALFA.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}

ALFA/.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/ALFA.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/ALFA.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/ALFA.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

ALFA/CodeGen-p5.js/Output/sketch.js

@@ -110,25 +110,17 @@ class ParalAnimation extends Animation {
     }
 }
 
-const x1 = 0
-const y1 = 0
-const x2 = 100
-const y2 = 140
-const length = 100
-const width = 200
-const animDuration = 1000
-const delay = 300
-const myrect1 = new Rectangle(x1,y1,width,length);
-
-const myrect2 = new Rectangle(x2,y2,length,length);
-
-const anim_0 = new MoveAnimation(myrect1,200,animDuration);
+const x = 0
+const y = 0
+const length = 20
+const animDuration = 4000
+const delay = 2000
+const myRect1 = new Rectangle(0,0,length,length);
+
+const anim_0 = new MoveAnimation(myRect1,200,animDuration);
 const anim_1 = new WaitAnimation(delay);
-const anim_2 = new MoveAnimation(myrect2,300,animDuration);
-const anim_3 = new MoveAnimation(myrect1,-200,animDuration);
-const anim_4 = new WaitAnimation(delay);
-const anim_5 = new MoveAnimation(myrect2,-200,animDuration);
-const seqAnim = new SeqAnimation([anim_0,anim_1,anim_2,anim_3,anim_4,anim_5]);
+const anim_2 = new MoveAnimation(myRect1,-200,animDuration);
+const seqAnim = new SeqAnimation([anim_0,anim_1,anim_2]);
 
 function setup() {
 	createCanvas(600, 600)
@@ -137,7 +129,6 @@ function setup() {
 
 function draw() {
 	background(255)
-	myrect1.render();
-	myrect2.render();
+	myRect1.render();
 	seqAnim.play();
 }

ALFA/src/ExceptionsHelper.cs → ALFA/src/Helpers/ExceptionsHelper.cs

@@ -27,3 +27,8 @@ public class UndeclaredVariableException : Exception
     public UndeclaredVariableException(string message)
         : base(message){}
 }
+
+public class RedeclaredVariableException : Exception
+{
+    public RedeclaredVariableException(string message) : base(message){}
+}

ALFA/src/Helpers/FormalParameters.cs

@@ -0,0 +1,24 @@
+using ALFA.Types;
+namespace ALFA;
+
+public static class FormalParameters
+{
+    public static readonly Dictionary<string, BuiltIn> FormalParams = new()
+    {
+        {"createRect", new BuiltIn(
+            new List<ALFATypes.TypeEnum>() 
+                { ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int }, 
+            ALFATypes.BuiltInTypeEnum.createRect)},
+
+        {"move", new BuiltIn(new List<ALFATypes.TypeEnum>()
+        {
+            ALFATypes.TypeEnum.rect, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int
+        },ALFATypes.BuiltInTypeEnum.move)},
+
+        {"wait", new BuiltIn(new List<ALFATypes.TypeEnum>()
+        {
+            ALFATypes.TypeEnum.@int
+        }, ALFATypes.BuiltInTypeEnum.wait)}
+    };
+
+}

ALFA/src/SymbolTable.cs → ALFA/src/Helpers/SymbolTable.cs

@@ -2,23 +2,22 @@ namespace ALFA;
 // Fischer Crafting a Compiler page 292 figure 8.7
 public class SymbolTable
 {
-    private int _depth = 0;
-    private Dictionary<string, Symbol> _symbols = new(); 
-    private List<Symbol?>_scopeDisplay = new() {null};  //open the first scope (Global scope) init with null
+    public int _depth = 0;
+    public Dictionary<string, Symbol> _symbols = new(); 
+    public List<Symbol?>_scopeDisplay = new() {null};  //open the first scope (Global scope) init with null
 
     public void OpenScope()
     {
         _depth++;
-        _scopeDisplay[_depth] = null;
+        _scopeDisplay.Add(null);
     }
-
     public void CloseScope()
     {
         Symbol? sym = _scopeDisplay[_depth];
         while (sym != null)
         {
             Symbol? prevSymbol = sym.PrevSymbol;
-            _symbols.Remove(sym.Name);
+            //_symbols.Remove(sym.Name);
             if (prevSymbol != null)
             {
                 _symbols.Add(prevSymbol.Name, prevSymbol);
@@ -32,35 +31,39 @@ public void CloseScope()
     public void EnterSymbol(Symbol symbol)
     {
         Symbol? oldSymbol = RetrieveSymbol(symbol.Name);
-        if (oldSymbol != null && oldSymbol.Depth == _depth)
+        if (oldSymbol != null)
         {
-            throw new Exception($"Symbol {symbol.Name} already declared on line {oldSymbol.LineNumber}:{oldSymbol.ColumnNumber}");
+            throw new RedeclaredVariableException(
+                $"Symbol {symbol.Name} already declared on line {oldSymbol.LineNumber}:{oldSymbol.ColumnNumber}");
         }
-        
+
         Symbol newSymbol = new(symbol.Name, symbol.Value, symbol.Type, symbol.LineNumber, symbol.ColumnNumber);
         newSymbol.Depth = _depth;
         _scopeDisplay[_depth] = newSymbol;
 
         if (oldSymbol == null)
         {
-            _symbols.Add(symbol.Name, newSymbol);
-        }
-        else
-        {
-            _symbols.Remove(oldSymbol.Name);
+            if (_symbols.ContainsKey(symbol.Name))
+            {
+                oldSymbol = _symbols[symbol.Name];
+                _symbols.Remove(symbol.Name);
+            }
             _symbols.Add(symbol.Name, newSymbol);
         }
 
+        //As the oldSymbol is set to previous symbol, one with the same name
+        //This could result in an issue when closing a scope as the oldsymbol
+        //may be overwritten and thus maybe lost.
         newSymbol.PrevSymbol = oldSymbol!;
     }
 
-    public Symbol? RetrieveSymbol(string name)
+    public Symbol? RetrieveSymbol(string name) 
     {
         Symbol? sym;
         if (!_symbols.TryGetValue(name, out sym)) return null;
         while (sym != null)
         {
-            if (sym.Name == name)
+            if (sym.Name == name && sym.Depth == _depth) 
             {
                 return sym;
             }
@@ -72,6 +75,18 @@ public void EnterSymbol(Symbol symbol)
 
     public bool DeclaredLocally(string name)
     {
-        return _scopeDisplay[_depth] != null && _scopeDisplay[_depth]!.Name == name;
+        bool isDeclaredLocally = false;
+        Symbol? sym = _scopeDisplay[_depth];
+        while (sym != null)
+        {
+            if (sym.Name == name)
+            {
+                isDeclaredLocally = true;
+            }
+
+            sym = sym.PrevSymbol;
+        }
+
+        return isDeclaredLocally; 
     }
 }

ALFA/src/Program.cs

@@ -26,27 +26,9 @@ public static void Main(string path = "../../../srcprograms/mvp.alfa",string pro
             ALFAParser parser = new ALFAParser(tokens);
             parser.BuildParseTree = true;
             IParseTree tree = parser.program();
-
-            Dictionary<string, BuiltIn> formalParams = new()
-            {
-                {"createRect", new BuiltIn(
-                    new List<ALFATypes.TypeEnum>() 
-                        { ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int }, 
-                    ALFATypes.BuiltInTypeEnum.createRect)},
-
-                {"move", new BuiltIn(new List<ALFATypes.TypeEnum>()
-                {
-                    ALFATypes.TypeEnum.rect, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int
-                },ALFATypes.BuiltInTypeEnum.move)},
-
-                {"wait", new BuiltIn(new List<ALFATypes.TypeEnum>()
-                {
-                    ALFATypes.TypeEnum.@int
-                }, ALFATypes.BuiltInTypeEnum.wait)}
-            };
-
+
             SymbolTable symbolTable = new();
-            BuildASTVisitor visitor = new BuildASTVisitor(symbolTable, formalParams);
+            BuildASTVisitor visitor = new BuildASTVisitor(symbolTable);
             Node ast = visitor.Visit(tree);
             TypeCheckVisitor typeCheckVisitor = new TypeCheckVisitor(symbolTable);
             typeCheckVisitor.Visit(ast);

ALFA/src/Visitors/BuildASTVisitor.cs

@@ -8,12 +8,10 @@ namespace ALFA.Visitors;
 public class BuildASTVisitor : ALFABaseVisitor<Node>
 {
     private SymbolTable _symbolTable;
-    private Dictionary<string, BuiltIn> _formalParams;
 
-    public BuildASTVisitor(SymbolTable symbolTable, Dictionary<string, BuiltIn> formalParams)
+    public BuildASTVisitor(SymbolTable symbolTable)
     {
         _symbolTable = symbolTable;
-        _formalParams = formalParams;
     }
 
     public override ProgramNode VisitProgram(ALFAParser.ProgramContext context)
@@ -41,7 +39,8 @@ public override VarDclNode VisitVarDcl(ALFAParser.VarDclContext context)
     {
         var parent = (ALFAParser.StatementContext)context.Parent;
         string id = context.ID().GetText();
-        ALFATypes.TypeEnum typeEnum;
+      //program should throw an exception if one of the children is a ErrorNodeImpl.
+      ALFATypes.TypeEnum typeEnum;
 
         switch (parent.type().GetText())
         {
@@ -95,7 +94,7 @@ public override FuncCallNode VisitFuncCall(ALFAParser.FuncCallContext context)
                 ALFATypes.TypeEnum[] formalMoveParamsArray = {ALFATypes.TypeEnum.rect, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int};
                 formalParams.AddRange(formalMoveParamsArray);
                 builtInTypeEnum = ALFATypes.BuiltInTypeEnum.move;
-                if (context.args().arg()[0].ID() == null) throw new ArgumentTypeException("You are trying to move something that isnt a rect");
+                if (context.args().arg()[0].ID() == null) throw new ArgumentTypeException("You are trying to move something that isn't a rect");
                 identifier = context.args().arg()[0].ID().GetText();
                 break;
             case "wait":
@@ -146,7 +145,7 @@ public override FuncCallNode VisitFuncCall(ALFAParser.FuncCallContext context)
     public override BuiltInsNode VisitBuiltIns(ALFAParser.BuiltInsContext context)
     {
         var type = context.GetText();
-        BuiltIn builtIn = _formalParams[type];
+        BuiltIn builtIn = FormalParameters.FormalParams[type];
         return new BuiltInsNode(builtIn.Type, builtIn.FormalParams,  context.Start.Line, context.Start.Column);
     }
 }

ALFA/src/Visitors/CodeGenVisitor.cs

@@ -7,14 +7,14 @@ namespace ALFA.Visitors;
 public class CodeGenVisitor : ASTVisitor<Node>
 {
 
-    private string _output = string.Empty;
-    private string _varOutput = string.Empty;
-    private string _setupOutput = string.Empty;
-    private string _drawOutput = string.Empty;
+    public string _output = string.Empty;
+    public string _varOutput = string.Empty;
+    public string _setupOutput = string.Empty;
+    public string _drawOutput = string.Empty;
 
-    private int _animationCount = 0;
-    private SymbolTable _symbolTable;
-    private string _path;
+    public int _animationCount = 0;
+    public SymbolTable _symbolTable;
+    public string _path;
 
     public CodeGenVisitor(SymbolTable st, string path)
     {

ALFA/src/Visitors/TypeCheckVisitor.cs

@@ -46,7 +46,7 @@ public override FuncCallNode Visit(FuncCallNode node)
             { //think this check is useless as the parser should not allow it
                 if (node.BuiltIns.FormalParams[i] != ALFATypes.TypeEnum.@int)
                     throw new ArgumentTypeException($"Invalid type expected {node.BuiltIns.FormalParams[i]} but got {ALFATypes.TypeEnum.@int} on line {numNode.Line}:{numNode.Col}");
-            }
+            } 
             i++;
         }
         return node;
@@ -60,12 +60,12 @@ public override VarDclNode Visit(VarDclNode node)
         if (visitedNode is FuncCallNode)
         {
             if (node.Type != ALFATypes.TypeEnum.rect)
-                throw new Exception($"Invalid type {node.Type}, expected type {ALFATypes.TypeEnum.rect} on line {node.Line}:{node.Col}");
+                throw new TypeException($"Invalid type {node.Type}, expected type {ALFATypes.TypeEnum.rect} on line {node.Line}:{node.Col}");
         }
         else if (visitedNode is NumNode)
         {
             if (node.Type != ALFATypes.TypeEnum.@int)
-                throw new Exception($"Invalid type {node.Type.ToString()}, expected type {ALFATypes.TypeEnum.@int} on line {node.Line}:{node.Col}");
+                throw new TypeException($"Invalid type {node.Type.ToString()}, expected type {ALFATypes.TypeEnum.@int} on line {node.Line}:{node.Col}");
         }
 
         return node;

AlfaTest/AlfaTest.csproj

@@ -10,6 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="Moq" Version="4.18.4" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

AlfaTest/BuildAST/BuildAstNoException.json

@@ -1,7 +1,17 @@
 [
   {
-    "Prog": "",
-    "Comment": "",
+    "Prog": "int x1 = 0;\nint y1 = 0;\nint x2 = 100;\nint y2 = 120;\n\nint length = 100;\nint width = 200;\nint animDuration = 1000;\nint delay = 300;\nrect myrect1 = createRect(x1, y1, width, length);\nrect myrect2 = createRect(x2, y2, length, length);\n\nmove(myrect1, 200, animDuration);\nwait(delay);\nmove(myrect2, 300, animDuration);\nmove(myrect1, -200, animDuration);\nwait(delay);\nmove(myrect2, -200, animDuration);",
+    "Comment": "laver 2 firkanter henholdsvis til højre og derefter venter hvorefter den rykker tilbage.",
+    "ExceptionType": ""
+  },
+  {
+    "Prog": "int x1 = 0;\nint y1 = 0;\nint x2 = 100;\nint y2 = 120;\n\nint length = 100;\nint width = 200;\nint animDuration = 1000;\nint delay = 300;\nrect myrect1 = createRect(x1, y1, width, length);\nrect myrect2 = createRect(x2, y2, length, length);\n\nmove(myrect1, -200, animDuration);\nwait(delay);\nmove(myrect2, -200, animDuration);",
+    "Comment" : "laver 2 firkanter og rykker dem til venstre",
+    "ExceptionType": ""
+  },
+  {
+    "Prog": "rect myrect1 = createRect(100, 100, 20, 20);\nrect myrect2 = createRect(300, 300, 20, 20);\n\nmove(myrect1, -200, 500);\nwait(1000);\nmove(myrect2, -200, 500);",
+    "Comment": "Laver rect med konstanter",
     "ExceptionType": ""
   }
 ]