Skip to content

Type name change #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FredTheNoob merged 2 commits into from
Mar 24, 2023
Merged

Type name change #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d37c1
Changed types to lowercase
JonasGLund99 Mar 24, 2023
b097034
Update namespaces, removed hardcoded messages etc.
JonasGLund99 Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ALFA/src/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Diagnostics;
using ALFA;
using ALFA.AST_Nodes;
using ALFA.Visitors;

MyParseMethod();

Expand Down
1 change: 0 additions & 1 deletion ALFA/src/Symbol.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ public Symbol(string name, int value, ALFATypes.TypeEnum type, int line, int col
ColumnNumber = column;
Type = type;
}

}
10 changes: 5 additions & 5 deletions ALFA/src/Types/ALFATypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ public class ALFATypes
{
public enum TypeEnum
{
Int,
Square
@int,
square
}

public enum BuiltInTypeEnum
{
CreateSquare,
Move,
Wait
createSquare,
move,
wait
}

}
3 changes: 1 addition & 2 deletions ALFA/src/Visitors/ASTPrintVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ALFA.AST_Nodes;
using Antlr4.Runtime.Tree;

namespace ALFA;
namespace ALFA.Visitors;

public class ASTPrintVisitor : ASTVisitor<Node>
{
Expand Down
47 changes: 23 additions & 24 deletions ALFA/src/Visitors/BuildASTVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ALFA.AST_Nodes;
using ALFA.Types;

namespace ALFA;
namespace ALFA.Visitors;

public class BuildASTVisitor : ALFABaseVisitor<Node>
{
Expand All @@ -27,9 +27,7 @@ public override ProgramNode VisitProgram(ALFAParser.ProgramContext context)
public override StatementNode VisitStatement(ALFAParser.StatementContext context)
{
if (context.varDcl() != null)
{
return VisitVarDcl(context.varDcl());
}

return VisitFuncCall(context.funcCall());
}
Expand All @@ -39,29 +37,28 @@ public override VarDclNode VisitVarDcl(ALFAParser.VarDclContext context)
var parent = (ALFAParser.StatementContext)context.Parent;
string id = context.ID().GetText();
ALFATypes.TypeEnum typeEnum;

switch (parent.type().GetText())
{
case "int":
typeEnum = ALFATypes.TypeEnum.Int;
typeEnum = ALFATypes.TypeEnum.@int;
break;
case "square":
typeEnum = ALFATypes.TypeEnum.Square;
typeEnum = ALFATypes.TypeEnum.square;
break;
default:
throw new Exception("Invalid type on line " + context.Start.Line + ":" + context.Start.Column);
}


if (context.funcCall() != null)
{
var funcCall = (FuncCallNode)Visit(context.funcCall());
_symbolTable.EnterSymbol(new Symbol(id, 0, ALFATypes.TypeEnum.Square, context.Start.Line, context.Start.Column));
_symbolTable.EnterSymbol(new Symbol(id, 0, ALFATypes.TypeEnum.square, context.Start.Line, context.Start.Column));
return new VarDclNode(typeEnum, id, funcCall, context.Start.Line, 0);
}

NumNode num = new NumNode(int.Parse(context.NUM().GetText()), context.Start.Line, context.Start.Column);
_symbolTable.EnterSymbol(new Symbol(id, num.Value, ALFATypes.TypeEnum.Int, context.Start.Line, context.Start.Column));
_symbolTable.EnterSymbol(new Symbol(id, num.Value, ALFATypes.TypeEnum.@int, context.Start.Line, context.Start.Column));
return new VarDclNode(typeEnum,id, num, context.Start.Line, 0);
}

Expand All @@ -74,18 +71,18 @@ public override FuncCallNode VisitFuncCall(ALFAParser.FuncCallContext context)
switch (type)
{
case "createSquare":
ALFATypes.TypeEnum[] formalCSParamsArray = {ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int};
ALFATypes.TypeEnum[] formalCSParamsArray = {ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalCSParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.CreateSquare;
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.createSquare;
break;
case "move":
ALFATypes.TypeEnum[] formalMovParamsArray = {ALFATypes.TypeEnum.Square, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int};
formalParams.AddRange(formalMovParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.Move;
ALFATypes.TypeEnum[] formalMoveParamsArray = {ALFATypes.TypeEnum.square, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalMoveParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.move;
break;
case "wait":
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.Wait;
ALFATypes.TypeEnum[] formalWaitParamsArray = {ALFATypes.TypeEnum.Int};
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.wait;
ALFATypes.TypeEnum[] formalWaitParamsArray = {ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalWaitParamsArray);
break;
default:
Expand Down Expand Up @@ -120,19 +117,19 @@ public override BuiltInsNode VisitBuiltIns(ALFAParser.BuiltInsContext context)
switch (type)
{
case "createSquare":
ALFATypes.TypeEnum[] formalCSParamsArray = {ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int};
ALFATypes.TypeEnum[] formalCSParamsArray = {ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalCSParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.CreateSquare;
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.createSquare;
break;
case "move":
ALFATypes.TypeEnum[] formalMovParamsArray = {ALFATypes.TypeEnum.Square, ALFATypes.TypeEnum.Int, ALFATypes.TypeEnum.Int};
ALFATypes.TypeEnum[] formalMovParamsArray = {ALFATypes.TypeEnum.square, ALFATypes.TypeEnum.@int, ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalMovParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.Move;
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.move;
break;
case "wait":
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.Wait;
ALFATypes.TypeEnum[] formalWaitParamsArray = {ALFATypes.TypeEnum.Int};
formalParams.AddRange(formalWaitParamsArray);
builtInTypeEnum = ALFATypes.BuiltInTypeEnum.wait;
ALFATypes.TypeEnum[] formalwaitParamsArray = {ALFATypes.TypeEnum.@int};
formalParams.AddRange(formalwaitParamsArray);
break;
default:
throw new Exception("Invalid built-in function");
Expand All @@ -149,7 +146,9 @@ public override ArgNode VisitArg(ALFAParser.ArgContext context)
if (id != null)
{
Symbol? sym = _symbolTable.RetrieveSymbol(id.GetText());
if (sym == null) throw new Exception($"Variable {id.GetText()} not declared at line {id.Symbol.Line}:{id.Symbol.Column}");
if (sym == null)
throw new Exception($"Variable {id.GetText()} not declared at line {id.Symbol.Line}:{id.Symbol.Column}");

IdNode idNode = new IdNode(id.GetText(), context.Start.Line, context.Start.Column);
return new ArgNode(idNode, context.Start.Line, context.Start.Column);
}
Expand Down
28 changes: 10 additions & 18 deletions ALFA/src/Visitors/TypeCheckVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using ALFA.AST_Nodes;
using ALFA.Types;

namespace ALFA;
namespace ALFA.Visitors;

public class TypeCheckVisitor : ASTVisitor<Node>
{
Expand All @@ -20,13 +20,13 @@ public override Node Visit(ProgramNode node)
}
return node;
}

public override Node Visit(StatementNode node)
{
Visit((dynamic)node);
return node;
}

public override Node Visit(FuncCallNode node)
{
if (node.Arguments.Count != node.BuiltIns.FormalParams.Count)
Expand All @@ -43,17 +43,13 @@ public override Node Visit(FuncCallNode node)
if (idSymbol != null)
{
if (idSymbol.Type != node.BuiltIns.FormalParams[i])
{
throw new Exception($"Invalid type, expected {node.BuiltIns.FormalParams[i]} but got {idSymbol.Type} on line {idNode.Line}:{idNode.Col}");
}
}
}
else if (actualParam.Value is NumNode numNode)
{
if (node.BuiltIns.FormalParams[i] != ALFATypes.TypeEnum.Int)
{
throw new Exception($"Invalid type expected {node.BuiltIns.FormalParams[i]} but got int on line {numNode.Line}:{numNode.Col}");
}
if (node.BuiltIns.FormalParams[i] != ALFATypes.TypeEnum.@int)
throw new Exception($"Invalid type expected {node.BuiltIns.FormalParams[i]} but got {ALFATypes.TypeEnum.@int} on line {numNode.Line}:{numNode.Col}");
}
i++;
}
Expand All @@ -66,22 +62,18 @@ public override Node Visit(VarDclNode node)

if (visitedNode is FuncCallNode)
{
if (node.Type != ALFATypes.TypeEnum.Square)
{
throw new Exception($"Invalid type {node.Type.ToString()}, expected type square on line {node.Line}:{node.Col}");
}
if (node.Type != ALFATypes.TypeEnum.square)
throw new Exception($"Invalid type {node.Type}, expected type {ALFATypes.TypeEnum.square} 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 int on line {node.Line}:{node.Col}");
}
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}");
}

return node;
}

public override Node Visit(BuiltInsNode node) => node;
public override Node Visit(ArgNode node) => node;
public override Node Visit(IdNode node) => node;
Expand Down
9 changes: 7 additions & 2 deletions ALFA/src/antlr/ALFA.interp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ null
'move'
'wait'
','
'int'
'square'
null
null
null
Expand All @@ -22,8 +24,10 @@ null
null
null
null
null
null
ID
INT
NUM
WS

rule names:
Expand All @@ -34,7 +38,8 @@ funcCall
builtIns
args
arg
type


atn:
[4, 1, 11, 51, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 1, 0, 4, 0, 16, 8, 0, 11, 0, 12, 0, 17, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 28, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 44, 8, 5, 10, 5, 12, 5, 47, 9, 5, 1, 6, 1, 6, 1, 6, 0, 0, 7, 0, 2, 4, 6, 8, 10, 12, 0, 2, 1, 0, 5, 7, 1, 0, 9, 10, 46, 0, 15, 1, 0, 0, 0, 2, 27, 1, 0, 0, 0, 4, 29, 1, 0, 0, 0, 6, 33, 1, 0, 0, 0, 8, 38, 1, 0, 0, 0, 10, 40, 1, 0, 0, 0, 12, 48, 1, 0, 0, 0, 14, 16, 3, 2, 1, 0, 15, 14, 1, 0, 0, 0, 16, 17, 1, 0, 0, 0, 17, 15, 1, 0, 0, 0, 17, 18, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19, 20, 5, 0, 0, 1, 20, 1, 1, 0, 0, 0, 21, 22, 3, 4, 2, 0, 22, 23, 5, 1, 0, 0, 23, 28, 1, 0, 0, 0, 24, 25, 3, 6, 3, 0, 25, 26, 5, 1, 0, 0, 26, 28, 1, 0, 0, 0, 27, 21, 1, 0, 0, 0, 27, 24, 1, 0, 0, 0, 28, 3, 1, 0, 0, 0, 29, 30, 5, 9, 0, 0, 30, 31, 5, 2, 0, 0, 31, 32, 3, 6, 3, 0, 32, 5, 1, 0, 0, 0, 33, 34, 3, 8, 4, 0, 34, 35, 5, 3, 0, 0, 35, 36, 3, 10, 5, 0, 36, 37, 5, 4, 0, 0, 37, 7, 1, 0, 0, 0, 38, 39, 7, 0, 0, 0, 39, 9, 1, 0, 0, 0, 40, 45, 3, 12, 6, 0, 41, 42, 5, 8, 0, 0, 42, 44, 3, 12, 6, 0, 43, 41, 1, 0, 0, 0, 44, 47, 1, 0, 0, 0, 45, 43, 1, 0, 0, 0, 45, 46, 1, 0, 0, 0, 46, 11, 1, 0, 0, 0, 47, 45, 1, 0, 0, 0, 48, 49, 7, 1, 0, 0, 49, 13, 1, 0, 0, 0, 3, 17, 27, 45]
[4, 1, 13, 60, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 1, 0, 4, 0, 18, 8, 0, 11, 0, 12, 0, 19, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 31, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 39, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 51, 8, 5, 10, 5, 12, 5, 54, 9, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 0, 0, 8, 0, 2, 4, 6, 8, 10, 12, 14, 0, 3, 1, 0, 5, 7, 1, 0, 11, 12, 1, 0, 9, 10, 55, 0, 17, 1, 0, 0, 0, 2, 30, 1, 0, 0, 0, 4, 38, 1, 0, 0, 0, 6, 40, 1, 0, 0, 0, 8, 45, 1, 0, 0, 0, 10, 47, 1, 0, 0, 0, 12, 55, 1, 0, 0, 0, 14, 57, 1, 0, 0, 0, 16, 18, 3, 2, 1, 0, 17, 16, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19, 17, 1, 0, 0, 0, 19, 20, 1, 0, 0, 0, 20, 21, 1, 0, 0, 0, 21, 22, 5, 0, 0, 1, 22, 1, 1, 0, 0, 0, 23, 24, 3, 14, 7, 0, 24, 25, 3, 4, 2, 0, 25, 26, 5, 1, 0, 0, 26, 31, 1, 0, 0, 0, 27, 28, 3, 6, 3, 0, 28, 29, 5, 1, 0, 0, 29, 31, 1, 0, 0, 0, 30, 23, 1, 0, 0, 0, 30, 27, 1, 0, 0, 0, 31, 3, 1, 0, 0, 0, 32, 33, 5, 11, 0, 0, 33, 34, 5, 2, 0, 0, 34, 39, 3, 6, 3, 0, 35, 36, 5, 11, 0, 0, 36, 37, 5, 2, 0, 0, 37, 39, 5, 12, 0, 0, 38, 32, 1, 0, 0, 0, 38, 35, 1, 0, 0, 0, 39, 5, 1, 0, 0, 0, 40, 41, 3, 8, 4, 0, 41, 42, 5, 3, 0, 0, 42, 43, 3, 10, 5, 0, 43, 44, 5, 4, 0, 0, 44, 7, 1, 0, 0, 0, 45, 46, 7, 0, 0, 0, 46, 9, 1, 0, 0, 0, 47, 52, 3, 12, 6, 0, 48, 49, 5, 8, 0, 0, 49, 51, 3, 12, 6, 0, 50, 48, 1, 0, 0, 0, 51, 54, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 52, 53, 1, 0, 0, 0, 53, 11, 1, 0, 0, 0, 54, 52, 1, 0, 0, 0, 55, 56, 7, 1, 0, 0, 56, 13, 1, 0, 0, 0, 57, 58, 7, 2, 0, 0, 58, 15, 1, 0, 0, 0, 4, 19, 30, 38, 52]
10 changes: 7 additions & 3 deletions ALFA/src/antlr/ALFA.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ T__4=5
T__5=6
T__6=7
T__7=8
ID=9
INT=10
WS=11
T__8=9
T__9=10
ID=11
NUM=12
WS=13
';'=1
'='=2
'('=3
Expand All @@ -17,3 +19,5 @@ WS=11
'move'=6
'wait'=7
','=8
'int'=9
'square'=10
45 changes: 0 additions & 45 deletions ALFA/src/antlr/ALFA/ALFA.interp
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ALFA/src/antlr/ALFA/ALFA.tokens
View file
Open in desktop

This file was deleted.

Loading