Added string parsing to parser and code generator

Author: JessicaTegner

code_generator.py

@@ -52,6 +52,9 @@ def generate_footer(self):
     def generate_NumberNode(self, node):
         return str(node.value)
 
+    def generate_StringNode(self, node):
+        return str(node.value)
+
     def generate_ExpressionNode(self, node):
         left_code = self.generate(node.left, is_root=False)
         right_code = self.generate(node.right, is_root=False)

custom_parser.py

@@ -1,6 +1,6 @@
 import logging
 from dictionary import Dictionary
-from parser_nodes import AssignmentNode, ExpressionNode, NumberNode, IfNode, CellReferenceNode
+from parser_nodes import AssignmentNode, ExpressionNode, NumberNode, StringNode, IfNode, CellReferenceNode
 
 logger = logging.getLogger(__name__)
 
@@ -71,6 +71,8 @@ def parse_primary(self, tokens):
         token = tokens[0]
         if token.type == Dictionary.INTEGER:
             return NumberNode(token.value), 1
+        elif token.type == Dictionary.STRING:
+            return StringNode(token.value), 1
         elif token.type == Dictionary.CELL:
             return self.parse_cell_reference(token), 1
         elif token.type == Dictionary.LEFT_PARENTHESES:
@@ -146,11 +148,13 @@ def parse_assignment(self, line):
             raise ValueError("Invalid assignment statement")
         variable = tokens[0]
         # if the variable is a cell reference, parse it
+        print(variable.type)
         if variable.type == Dictionary.CELL:
             variable = self.parse_cell_reference(variable)
         # everything after the assignment token is the expression
         variable_value = tokens[i+1:]
         # if we only have 1 token, and it's an identifier, we can return the variable
+        print(variable_value[0].type)
         if len(variable_value) == 1 and variable_value[0].type == Dictionary.IDENTIFIER:
             return AssignmentNode(variable, variable_value[0])
         # otherwise, parse the expression
@@ -169,7 +173,7 @@ def parse_cell_reference(self, token):
             raise ValueError("Invalid cell reference")
         if not any(char in token.value for char in Dictionary.ALPHABETIC_CHARACTERS):
             raise ValueError("Invalid cell reference")
-        if any(char not in Dictionary.NUMERIC_CHARACTERS + Dictionary.ALPHABETIC_CHARACTERS for char in token.value):
+        if any(char not in Dictionary.NUMERIC_CHARACTERS | Dictionary.ALPHABETIC_CHARACTERS for char in token.value):
             raise ValueError("Invalid cell reference")
         # there can be no numeric characters before the alphabetic characters. SO go through the string until we find a numeric character, and then check if the rest of the string is numeric
         i = 0

parser_nodes.py

@@ -33,6 +33,17 @@ def __repr__(self):
     def __str__(self):
         return self.__repr__()
 
+class StringNode(Node):
+    """Class for nodes that represent strings (str)."""
+    def __init__(self, value):
+        self.value = value
+
+    def __repr__(self):
+        return f"StringNode({self.value})"
+    
+    def __str__(self):
+        return self.__repr__()
+
 class IfNode(Node):
     """Class for nodes that represent if statements."""
     def __init__(self, condition, body):

text_input.txt

@@ -2,4 +2,4 @@ if 2 + 40 is equal to 42
 	x is "Skynet status: online"
 	y is 'Oh shit!'
 
-cell R2D2 is 1337
+cell a2 is 1337