Minor fixes in compiler

eddiecooro · Oct 14, 2019 · 388bf5c · 388bf5c
1 parent 54b53bc
commit 388bf5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/11/CompilationEngine.js b/11/CompilationEngine.js
@@ -648,7 +648,9 @@ class CompilationEngine {
       // Nothing is needed
     }
 
-    this.compileSubroutineBody();
+    if (this.tokenizer.symbol() !== '}') {
+      this.compileSubroutineBody();
+    }
     this._extractSymbol('}');
 
     this.vmWriter.writeLabel(this.endOfCurrentSubroutine);

diff --git a/11/SymbolTable.js b/11/SymbolTable.js
@@ -3,6 +3,14 @@ class SymbolTable {
     this.symbols = {};
   }
 
+  safeGet(name) {
+    let symbol = this.symbols[name];
+    if (!symbol) {
+      throw new Error('Symbol with name: ' + name + ' is not defined.');
+    }
+    return symbol;
+  }
+
   startSubroutine() {
     this.symbols = Object.entries(this.symbols).reduce(
       (newSymbols, [k, s]) =>
@@ -33,15 +41,15 @@ class SymbolTable {
   }
 
   kindOf(name) {
-    return this.symbols[name].kind;
+    return this.safeGet(name).kind;
   }
 
   typeOf(name) {
-    return this.symbols[name].type;
+    return this.safeGet(name).type;
   }
 
   indexOf(name) {
-    return this.symbols[name].id;
+    return this.safeGet(name).id;
   }
 }