From 689670a69eb8f914bf013c74a574e2f4a189abef Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@catseye.tc>
Date: Tue, 13 Mar 2018 09:25:06 +0000
Subject: [PATCH] Small bugfixes and changes.

---
 README.md                            | 4 ++--
 eg/c64/{ => demo-game}/demo-game.60p | 0
 eg/c64/intr1.60p                     | 7 ++++---
 src/sixtypical/scanner.py            | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)
 rename eg/c64/{ => demo-game}/demo-game.60p (100%)

diff --git a/README.md b/README.md
index 1696c70..7ebf1b8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 SixtyPical
 ==========
 
-_Version 0.13.  Work-in-progress, everything is subject to change._
+_Version 0.14.  Work-in-progress, everything is subject to change._
 
 **SixtyPical** is a 6502-assembly-like programming language with advanced
 static analysis.
@@ -51,7 +51,7 @@ automatically start it in the `x64` emulator, and you should see:
 ![Screenshot of result of running hearts.60p](https://raw.github.com/catseye/SixtyPical/master/images/hearts.png)
 
 You can try the `loadngo.sh` script on other sources in the `eg` directory
-tree.  There is an entire small game(-like program) in [demo-game.60p](eg/c64/demo-game.60p).
+tree.  There is an entire small game(-like program) in [demo-game.60p](eg/c64/demo-game/demo-game.60p).
 
 Documentation
 -------------
diff --git a/eg/c64/demo-game.60p b/eg/c64/demo-game/demo-game.60p
similarity index 100%
rename from eg/c64/demo-game.60p
rename to eg/c64/demo-game/demo-game.60p
diff --git a/eg/c64/intr1.60p b/eg/c64/intr1.60p
index b6a1d3d..68cad5c 100644
--- a/eg/c64/intr1.60p
+++ b/eg/c64/intr1.60p
@@ -12,16 +12,17 @@ byte vic_border @ 53280
 // a future version of SixtyPical.
 //
 
-vector cinv
+vector routine
   inputs vic_border
   outputs vic_border
   trashes z, n
-  @ 788
+    cinv @ 788
 
-vector save_cinv
+vector routine
   inputs vic_border
   outputs vic_border
   trashes z, n
+    save_cinv
 
 routine our_cinv
   inputs vic_border
diff --git a/src/sixtypical/scanner.py b/src/sixtypical/scanner.py
index 72bca62..d15ac4f 100644
--- a/src/sixtypical/scanner.py
+++ b/src/sixtypical/scanner.py
@@ -62,7 +62,7 @@ class Scanner(object):
         if self.token == token:
             self.scan()
         else:
-            raise SixtyPicalSyntaxError(self.scanner.line_number, "Expected '{}', but found '{}'".format(
+            raise SixtyPicalSyntaxError(self.line_number, "Expected '{}', but found '{}'".format(
                 token, self.token
             ))
 
@@ -74,7 +74,7 @@ class Scanner(object):
 
     def check_type(self, type):
         if not self.type == type:
-            raise SixtyPicalSyntaxError(self.scanner.line_number, "Expected {}, but found '{}'".format(
+            raise SixtyPicalSyntaxError(self.line_number, "Expected {}, but found '{}'".format(
                 self.type, self.token
             ))