VMT bug-fixes, i.e. static variables now work as intended.

Author: roboryman

07/vmt.py

@@ -16,6 +16,10 @@
 from vmt_modules.code_writer import CodeWriter
 
 
+__author__ = "Merrick Ryman"
+__version__ = "1.1"
+
+
 def main():
     vm_path = Path(sys.argv[-1])
     vm_glob = []
@@ -35,6 +39,7 @@ def main():
 
     code_writer = CodeWriter(asm_path)
     for vm_file in vm_glob:
+        code_writer.set_file_name(vm_file.name)
         vm_parser = Parser(vm_file)
         while vm_parser.has_more_commands():
             if vm_parser.command_type() is Command.C_ARITHMETIC:

07/vmt_modules/code_writer.py

@@ -9,19 +9,24 @@
 from .command import Command
 
 
+__author__ = "Merrick Ryman"
+__version__ = "1.1"
+
+
 class CodeWriter:
     def __init__(self, out_path):
         self.out_path = out_path
         self._dynamic_labels = {'lt':0, 'eq':0, 'gt':0}
         self._bool_jmp_logic_symbol = ''
         self._asm_file = open(out_path, 'w+')
+        self._vm_file_name = None
 
 
     def set_file_name(self, file_name):
         """Informs the code writer that the
         translation of a new VM file has started.
-        (Possibly for dynamic label making)?
         """
+        self._vm_file_name = file_name[:file_name.find('.')]
 
 
     def write_arithmetic(self, command):
@@ -105,8 +110,7 @@ def write_push_pop(self, command, segment, index):
                     self._asm_file.write('@5\n')
                     self._asm_file.write('A=D+A\n')
                 elif segment == 'static':
-                    self._asm_file.write('@16\n')
-                    self._asm_file.write('A=D+A\n')
+                    self._asm_file.write('@'+self._vm_file_name+'.'+str(index)+'\n')
                 self._asm_file.write('D=M\n')
                 self._asm_file.write('@SP\n')
                 self._asm_file.write('AM=M+1\n')
@@ -136,8 +140,8 @@ def write_push_pop(self, command, segment, index):
                     self._asm_file.write('@5\n')
                     self._asm_file.write('D=D+A\n')
                 elif segment == 'static':
-                    self._asm_file.write('@16\n')
-                    self._asm_file.write('D=D+A\n')
+                    self._asm_file.write('@'+self._vm_file_name+'.'+str(index)+'\n')
+                    self._asm_file.write('D=A\n') # d = d + a
                 self._asm_file.write('@R13\n')
                 self._asm_file.write('M=D\n')
                 self._asm_file.write('@SP\n')

07/vmt_modules/parser.py

@@ -12,6 +12,10 @@
 from .command import Command
 
 
+__author__ = "Merrick Ryman"
+__version__ = "1.0"
+
+
 class Parser:
     def __init__(self, in_path):
         self.in_path = in_path

README.md

@@ -1,6 +1,5 @@
 # nand2tetris (The Elements of Computing Systems)
-My code for the hardware and software projects as described in The Elements of Computing Systems by Noam Nisan and Shimon Schocken.
-
+My code for the hardware and software projects as described in The Elements of Computing Systems by Noam Nisan and Shimon Schocken.\
 Abstraction rules all.
 
 ### Chapter 01 - Boolean Logic
@@ -29,11 +28,11 @@ Also take note that all A-Instructions have essentially 'piggy backed' onto C-In
   * *Macro-commands are like so:* 'M=D[123]' is equivalent to '@123' followed by 'M=D'.
 Of course, this also works for symbols: 'M=D[foo]' is equivalent to '@foo' followed by 'M=D'.
 
-### Chapter 07 - VM I: Stack Arithmetic
+### Chapter 07 - Virtual Machine I: Stack Arithmetic
 Python3 for Virtual Machine Translator.\
 Python3 for VMT modules CodeWriter, Parser, and Command.
 
-### Chapter 08 - VM II: Program Control
+### Chapter 08 - Virtual Machine II: Program Control
 #### In Progress.
 
 ### Chapter 09 - High-Level Language