Codewriter

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "cwd": "${workspaceFolder}\\nand2tetris\\projects\\7\\VMTranslator",
+            "env": {
+                "PYTHONPATH": "${workspaceFolder}\\nand2tetris\\projects\\7\\VMTranslator"
+            }
+        },
+        {
+            "name": "Python Debugger: Python File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}"
+        }
+    ]
+}

nand2tetris/projects/7/StackArithmetic/.gitignore

@@ -0,0 +1 @@
+*.asm

nand2tetris/projects/7/VMTranslator/VMTranslator.py

@@ -5,20 +5,15 @@
 #### ---- import ----
 # https://stackoverflow.com/a/37867717/3560695
 
-import importlib.util
-import sys
 import re
 
 ## Import parser
 ## We have to use import_module since the path contains an illegal directory name (7). 
-parser_module = importlib.import_module("nand2tetris.projects.7.VMTranslator.src.parser.parser")
-Parser = parser_module.parser
-
-writer_module = importlib.import_module("nand2tetris.projects.7.VMTranslator.src.codewriter.codewriter")
-codewriter = writer_module.codewriter
-
-
+# parser_module = importlib.import_module("src.parser.parser")
+import src.parser.parser as p
 
+# writer_module = importlib.import_module("src.codewriter.codewriter")
+import src.codewriter.codewriter as cw
 
 
 #### ---- main ----
@@ -35,113 +30,59 @@ def main(filename):
     filename_write = re.sub(regex, r"\1\2.asm", filename)
 
 
+    Parser = p.parser
+    codewriter = cw.codewriter
+
     with open(filename, 'r') as file, open(filename_write, "w") as file_write:
         parser = Parser(file)
         writer = codewriter(file_write)
 
         while parser.hasMoreCommands(): ## As long as file has more lines, do:
             parser.advance()            ## Go to the next line in the file.
-            parser.getinstruction()     ## sets parser.instruction to current instruction
+            parser.getinstruction()
             if not parser.instruction:  ## If instruction is blank, skip. Line consisted only of a comment. 
                 continue
-            print(f"---- Line {parser.lineNo} ----")
-            print(f"instruction = {parser.instruction}")
-            print(f"commandType() = {parser.commandType()}")
-            print(f"arg1() = {parser.arg1()}")
-            print(f"arg2() = {parser.arg2()}")
+            parser.getVMinstruction()   ## sets parser.VMinstruction to current instruction
 
+            # print(f"---- Line {parser.lineNo} ----")
+            # print(f"instruction = {parser.instruction}")
+            # print(f"commandType() = {parser.commandType()}, type = {type(parser.commandType())}")
+            # print(f"arg1() = {parser.arg1()}")
+            # print(f"arg2() = {parser.arg2()}")
+
+
+            commandType = parser.commandType()
             if parser.commandType() == "C_ARITHMETIC":
                 # Write arithmetic from arithmetic.asm
-                ...
+                arg1 = parser.arg1()
+                lines = writer.writeArithmetic(arg1)
+
             elif parser.commandType() in ["C_PUSH", "C_POP"]:
-                writer.writePushPop(parser.commandType(), parser.arg1(), parser.arg2())                  
+                arg1 = parser.arg1()
+                arg2 = parser.arg2()
+                lines = writer.writePushPop(commandType, arg1, arg2)
             else:
                 ...
+
+            ## lines is now the full .asm script. Write to output asm file.
+            file_write.write(f'// {parser.instruction}\n')
+            for line in lines:
+                file_write.write(f'{line}\n')
 
 
+
 
 
-## Testing
-filename = '/nand2tetris/projects/7/StackArithmetic/SimpleAdd/SimpleAdd.vm'
-
-main(filename[1:])
-
-
-
-
-
-## Below is probably redundant
-
-
-
-
-
+import importlib
 
+## Testing
+filename = '.../StackArithmetic/SimpleAdd/SimpleAdd.vm'
+filename = '.../StackArithmetic/Stacktest/Stacktest.vm'
 
-# https://chat.openai.com/share/40c7964c-0f2f-44d2-81c7-e88d6a1868a1
-def changeExtension(string : str, newExtension : str):
-    """
-    """
-    if not isinstance(string, str):
-        raise TypeError("Input <string> must be a string")
-    if not isinstance(newExtension, str):
-        raise TypeError("Input <newExtension> must be a string")
-
-    # Regex pattern to capture the base name and extension
-    # https://regex101.com/r/SkENd5/1
-    regex = r"^(?P<base>[^.].*\.)(?P<extension>\w+)$|(?P<fullname>^.*$)"
-
-    # Replace the extension with the new extension
-    new_string = re.sub(
-        regex, 
-        lambda m: (
-            m.group('base') + newExtension 
-            if m.group('base') 
-            else m.group('fullname')
-        ), 
-        string)
-
-    return new_string
-
-
-def writelines(input_data : str | list, filename) -> None:
-    """
-    Write the given string or list of strings to the specified file.
-
-    Args:
-        input_data (str | list): The string or list of strings to write to the file.
-        filename (str): The name of the file to write to.
-
-    Raises:
-        TypeError: If input_data is neither a string nor a list, or if filename is not a string.
-        ValueError: If filename is an empty string.
-        IOError: If there is an issue writing to the file.
-
-    Returns:
-        None
-    """
-    # Check input types
-    if not isinstance(input_data, (str, list)):
-        raise TypeError("Input data must be a string or a list of strings")
-    if not isinstance(filename, str):
-        raise TypeError("Filename must be a string")
-
-    # Check filename is not empty
-    if not filename:
-        raise ValueError("Filename cannot be an empty string")
-
-    # Open the file in write mode
-    try:
-        with open(filename, 'w') as file:
-            # Write data to the file
-            if isinstance(input_data, str):
-                file.write(input_data)
-            else:
-                file.writelines(input_data)
-    except IOError as e:
-        raise IOError("Error writing to file: " + str(e))
-
+importlib.reload(p)
+importlib.reload(cw)
 
+main(filename[1:])
 
 
 

nand2tetris/projects/7/VMTranslator/__init__.py

@@ -0,0 +1 @@
+__package__ = ''

nand2tetris/projects/7/VMTranslator/src/Archive/deprecated.py

@@ -0,0 +1,72 @@
+
+
+# https://chat.openai.com/share/40c7964c-0f2f-44d2-81c7-e88d6a1868a1
+def changeExtension(string : str, newExtension : str):
+    """
+    """
+    if not isinstance(string, str):
+        raise TypeError("Input <string> must be a string")
+    if not isinstance(newExtension, str):
+        raise TypeError("Input <newExtension> must be a string")
+
+    # Regex pattern to capture the base name and extension
+    # https://regex101.com/r/SkENd5/1
+    regex = r"^(?P<base>[^.].*\.)(?P<extension>\w+)$|(?P<fullname>^.*$)"
+
+    # Replace the extension with the new extension
+    new_string = re.sub(
+        regex, 
+        lambda m: (
+            m.group('base') + newExtension 
+            if m.group('base') 
+            else m.group('fullname')
+        ), 
+        string)
+
+    return new_string
+
+
+def writelines(input_data : str | list, filename) -> None:
+    """
+    Write the given string or list of strings to the specified file.
+
+    Args:
+        input_data (str | list): The string or list of strings to write to the file.
+        filename (str): The name of the file to write to.
+
+    Raises:
+        TypeError: If input_data is neither a string nor a list, or if filename is not a string.
+        ValueError: If filename is an empty string.
+        IOError: If there is an issue writing to the file.
+
+    Returns:
+        None
+    """
+    # Check input types
+    if not isinstance(input_data, (str, list)):
+        raise TypeError("Input data must be a string or a list of strings")
+    if not isinstance(filename, str):
+        raise TypeError("Filename must be a string")
+
+    # Check filename is not empty
+    if not filename:
+        raise ValueError("Filename cannot be an empty string")
+
+    # Open the file in write mode
+    try:
+        with open(filename, 'w') as file:
+            # Write data to the file
+            if isinstance(input_data, str):
+                file.write(input_data)
+            else:
+                file.writelines(input_data)
+    except IOError as e:
+        raise IOError("Error writing to file: " + str(e))
+
+
+
+
+
+
+
+