Variables declarations and initializations added (previously forgotten)

Author: jakseluz

antlr/GreekBaseLexer.g4

@@ -22,8 +22,12 @@ KW_USE        : 'use';
 KW_WITH       : 'with';
 KW_NEW        : 'new';
 KW_PRINT      : 'print';
-KW_LCURL : '{';
-KW_RCURL : '}';
+KW_LCURL      : '{';
+KW_RCURL      : '}';
+KW_INT        : 'int';
+KW_FLOAT      : 'float';
+KW_CHAR       : 'char';
+KW_STRING     : 'string';
 
 // Symbols and operators
 OP_ASSIGN     : ':=';

antlr/GreekBaseParser.g4

@@ -72,7 +72,7 @@ assignment
     ;
 
 variableDeclaration
-    : literal IDENTIFIER OP_SEMICOLON;
+    : IDENTIFIER OP_COLON varType (OP_ASSIGN expression)? OP_SEMICOLON;
 
 
 // ----procedure specific things----
@@ -135,3 +135,10 @@ relop
     | OP_GREATER
     | OP_GREATER_EQ
     ;
+
+varType
+    : KW_INT
+    | KW_FLOAT
+    | KW_CHAR
+    | KW_STRING
+    ;

src/astGreek.py

@@ -26,6 +26,9 @@ class Literal(Expression):
 class RelationOperator(ASTNode):
     pass
 
+class VariableType(ASTNode):
+    pass
+
 
 # LITERALS
 @dataclass
@@ -148,5 +151,6 @@ class Procedure(Statement):
 # variables
 @dataclass
 class VariableDeclaration(NonDeclarativeStatement):
-    varType: Literal
-    id: Identifier
+    varType: VariableType
+    id: Identifier
+    varValue : Literal

src/ast_builder.py

@@ -10,9 +10,26 @@ def visitProgram(self, ctx: GreekBaseParser.ProgramContext):
         return ast.Program(ctx.start.line, ctx.start.column, [self.visit(stmt) for stmt in ctx.statement()])
 
     def visitVariableDeclaration(self, ctx: GreekBaseParser.VariableDeclarationContext):
-        var_name = ctx.Identifier().getText()
-        var_type = self.visit(ctx.literal())
-        return ast.VariableDeclaration(ctx.start.line, ctx.start.column, var_type, var_name)
+        var_name = ctx.IDENTIFIER().getText()
+        var_type = self.visit(ctx.varType())
+        if ctx.expression():
+            var_value = self.visit(ctx.expression())
+        else:
+            var_value = None
+        return ast.VariableDeclaration(ctx.start.line, ctx.start.column, var_type, var_name, var_value)
+    
+    def visitVarType(self, ctx: GreekBaseParser.VarTypeContext):
+        if ctx.KW_INT():
+            return int
+        elif ctx.KW_FLOAT():
+            return float
+        elif ctx.KW_CHAR():
+            return str
+        elif ctx.KW_STRING():
+            return str
+        else:
+            return None
+
 
     def visitAssignment(self, ctx: GreekBaseParser.AssignmentContext):
         # Handles: IDENTIFIER := expression;