Fix bug in expression--> variable production

src/lexing/lexing_rules.py

@@ -117,7 +117,7 @@ def t_aux_rcomment(t):
     r'\*\)'
     t.lexer.level -= 1
     if t.lexer.level == 0:
-        t.value = t.lexer.lexdata[t.lexer.comm_start:t.lexer.lexpos+1]
+        t.value = t.lexer.lexdata[t.lexer.comm_start:t.lexer.lexpos]
         t.type = "COMMENT"
         t.lexer.lineno += t.value.count('\n')
         t.lexer.begin('INITIAL')
@@ -131,7 +131,7 @@ def t_aux_pass(t):
 # Rule so we can track line numbers
 
 
-def t_ANY_newline(t):
+def t_newline(t):
     r'\n+'
     t.lexer.lineno += len(t.value)
     t.lexer.col = 1

src/parsing/parsing_rules.py

@@ -6,7 +6,7 @@
                   InstantiateNode, IntNode, IsVoidNode, LessNode,
                   LessOrEqualNode, LetNode, LoopNode, MethodCallNode, MethodDeclarationNode,
                   MinusNode, NotNode, PlusNode, ProgramNode, StarNode,
-                  StringNode, VarDeclarationNode)
+                  StringNode, VarDeclarationNode, VariableNode)
 
 
 def p_program(p):
@@ -30,6 +30,9 @@ def p_class(p):
         p[0] = ClassDeclarationNode(p[2], p[6], p[4])
     elif len(p) == 6:
         p[0] = ClassDeclarationNode(p[2], p[4])
+
+    p[0].set_position(p.slice[1].lineno, p.slice[1].col)
+
 
 
 def p_feature_list(p):
@@ -238,7 +241,7 @@ def p_expression_string(p):
 
 def p_expression_variable(p):
     """expression : ID"""
-    p[0] = InstantiateNode(p[1])
+    p[0] = VariableNode(p[1])
 
 
 def p_expression_true(p):
@@ -261,8 +264,8 @@ def p_empty(p):
     p[0] = []
 
 
-def p_error(p):
-    print(f"Syntax error in input! {p} ")#line:{p.lineno} col:{p.col}")
+def p_error(t):
+    print(f"Syntax error in input! {t} ")#line:{p.lineno} col:{p.col}")
 
 
 

src/semantics/type_builder.py

@@ -11,7 +11,7 @@ def __init__(self, context: Context):
         self.errors = []
 
     @visitor.on('node')
-    def visit(self, node):
+    def visit(self, node): 
         pass
 
     @visitor.when(ProgramNode)

tests/parser_test.py

@@ -1,6 +1,6 @@
 import pytest
 import os
-from utils import compare_errors
+from .utils import compare_errors
 
 tests_dir = __file__.rpartition('/')[0] + '/parser/'
 tests = [(file) for file in os.listdir(tests_dir) if file.endswith('.cl')]

tests/semantic_test.py

@@ -1,6 +1,6 @@
 import pytest
 import os
-from utils import compare_errors, first_error_only_line
+from .utils import compare_errors, first_error_only_line
 
 tests_dir = __file__.rpartition('/')[0] + '/semantic/'
 tests = [(file) for file in os.listdir(tests_dir) if file.endswith('.cl')]