Fixes #19

nrkn · Oct 27, 2015 · 4086024 · 4086024
1 parent 547e342
commit 4086024
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 95 deletions.
diff --git a/hrm.js b/hrm.js
@@ -1,5 +1,5 @@
+const parse = require( 'hrm-parser' )
 const normalizeOptions = require( './normalize-options' )
-const parse = require( './parse' )
 const runtimeErrors = require( './runtime-errors' )
 
 const asNumber = s =>

diff --git a/normalize-options.js b/normalize-options.js
@@ -28,7 +28,7 @@ module.exports = options => {
 
   if( options ){
     if( !options.tiles ){
-      options = Object.assign( {}, { tiles: options } )
+      options = { tiles: options }
     }
 
     return Object.assign( {}, defaults, options )

diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
   "scripts": {},
   "dependencies": {
     "hrm-level-data": "^1.0.0",
+    "hrm-parser": "^0.1.3",
     "tv4": "^1.2.7"
   }
 }
diff --git a/parse.js b/parse.js
diff --git a/polyfills.js b/polyfills.js
diff --git a/runtime-errors.js b/runtime-errors.js
@@ -46,10 +46,10 @@ const EmptyTileError = instrName => {
   }
 }
 
-const OutOfBoundsError = instrName => {
+const BadTileAddressError = address => {
   return {
-    name: 'No Such Tile',
-    message: `No such tile! You can't ${ instrName } with a tile that isn't on the floor!`
+    name: 'Bad Tile Address',
+    message: `Bad tile address! Tile with address ${ address } does not exist! Where do you think you're going?`
   }
 }
 
@@ -88,7 +88,7 @@ module.exports = ( instr, arg, state ) => {
     },
     memory: ( name, address ) => {
       if( address >= state.memorySize )
-        throw OutOfBoundsError( name )
+        throw BadTileAddressError( address )
 
       if( state.memory[ address ] === undefined || state.memory[ address ] === null )
         throw EmptyTileError( name )

diff --git a/test/runtime.js b/test/runtime.js
@@ -63,7 +63,7 @@ a:
 a:  
     JUMPN a
   `,
-  "Out Of Bounds": `
+  "Bad Tile Address": `
     COPYFROM 2
   `,
   "Instruction Not Allowed": `