Number each temporary uniquely across program. Sweet!

doc/Emitting.markdown

@@ -234,17 +234,19 @@ temporaries are not unioned yet, but they could be.
     =   jsr a
     =   jsr b
     =   rts
+    = 
     = a:
     =   lda _temp_1
     =   sta _temp_2+1
     =   rts
+    = 
     = b:
     =   lda _temp_3
     =   sta _temp_4
     =   rts
     = 
     = .data
-    = .space _temp_1 1
-    = .space _temp_2 2
     = .space _temp_3 1
     = .space _temp_4 2
+    = .space _temp_1 1
+    = .space _temp_2 2

src/SixtyPical/Transformer.hs

@@ -147,18 +147,19 @@ fillOutNamedLocationTypes p@(Program decls routines) =
 -- TODO: look at all blocks, not just routine's blocks
 renameBlockDecls (Program decls routines) =
     let
-        routines' = map renameRoutineDecls routines
+        routines' = renameRoutineDecls 1 routines
     in
         Program decls routines'
 
-renameRoutineDecls (Routine name outputs block) =
+renameRoutineDecls id [] = []
+renameRoutineDecls id ((Routine name outputs block):routs) =
     let
         (Block decls _) = block
-        (id', block') = foldDeclsRenaming decls 0 block
+        (id', block') = foldDeclsRenaming decls id block
+        rest = renameRoutineDecls id' routs
     in
-        (Routine name outputs block')
+        ((Routine name outputs block'):rest)
 
--- TODO accumulator has to range across all routines too!
 foldDeclsRenaming [] id block = (id, block)
 foldDeclsRenaming ((Reserve name typ Nothing):decls) id block =
     let