named_location production; syntax is "asl .a" now

README.markdown

@@ -116,7 +116,8 @@ TODO
 *   Addressing modes — indexed mode on more instructions
 *   `jsr (vector)`
 *   `jmp routine`
-*   insist on EOL after each instruction.  need spacesWOEOL production
-*   asl .a
+*   comments in any spaces; forget the eol thing
 *   `outputs` on externals
 *   Routine is a kind of StorageLocation?  (Location)?
+*   remove DELTA -> ADD
+*   Poisoning the highbyte or lowbyte of a word should poison the word

doc/Instruction_Support.markdown

@@ -264,13 +264,13 @@ Big test for parsing and emitting instructions.
     | reserve byte vbyte
     | assign byte table table 1024
     | routine main {
-    |    asl @
+    |    asl .a
     |    asl vbyte
-    |    lsr @
+    |    lsr .a
     |    lsr vbyte
-    |    rol @
+    |    rol .a
     |    rol vbyte
-    |    ror @
+    |    ror .a
     |    ror vbyte
     |    bit vbyte
     |    eor #5

src/SixtyPical/Emitter.hs

@@ -8,8 +8,8 @@ import SixtyPical.Model
 
 emitProgram p@(Program decls routines) =
     let
-        mains = findRoutines (\(Routine name _ _) -> name == "main") routines
-        allElse = findRoutines (\(Routine name _ _) -> name /= "main") routines
+        mains = filter (\(Routine name _ _) -> name == "main") routines
+        allElse = filter (\(Routine name _ _) -> name /= "main") routines
     in
         emitRoutines p mains ++
         emitRoutines p allElse ++

src/SixtyPical/Model.hs

@@ -176,8 +176,3 @@ lookupRoutine' [] _ = Nothing
 lookupRoutine' (rout@(Routine rname _ _):routs) name
     | rname == name = Just rout
     | otherwise     = lookupRoutine' routs name
-
-findRoutines f [] = []
-findRoutines f (rout:routs)
-    | f rout    = (rout:findRoutines f routs)
-    | otherwise = findRoutines f routs

src/SixtyPical/Parser.hs

@@ -57,7 +57,7 @@ reserve = do
     string "reserve"
     spaces
     sz <- storage_type
-    name <- locationName
+    name <- location_name
     return $ Reserve name sz
 
 assign :: Parser Decl
@@ -65,7 +65,7 @@ assign = do
     string "assign"
     spaces
     sz <- storage_type
-    name <- locationName
+    name <- location_name
     addr <- address
     return $ Assign name sz addr
 
@@ -104,10 +104,12 @@ routine_outputs = do
     spaces
     string "("
     spaces
-    locations <- many locationName
+    locations <- many location
     string ")"
     spaces
-    return (map (\x -> NamedLocation Nothing x) locations)
+    return locations
+
+location = (try explicit_register <|> named_location)
 
 block :: Parser [Instruction]
 block = do
@@ -150,34 +152,45 @@ data AddressingModality = Directly LocationName
 low_byte_of_absolute :: Parser AddressingModality
 low_byte_of_absolute = do
     string "<"
-    l <- locationName
+    l <- location_name
     return $ LowBytely l
 
 high_byte_of_absolute :: Parser AddressingModality
 high_byte_of_absolute = do
     string ">"
-    l <- locationName
+    l <- location_name
     return $ HighBytely l
 
 indirect_location :: Parser AddressingModality
 indirect_location = do
     string "("
     spaces
-    l <- locationName
+    l <- location_name
     string ")"
     spaces
     return $ Indirectly l
 
 direct_location :: Parser AddressingModality
 direct_location = do
-    l <- locationName
+    l <- location_name
     return $ Directly l
 
+explicit_location :: String -> StorageLocation -> Parser StorageLocation
+explicit_location s l = do
+    string s
+    spaces
+    return $ l
+
+explicit_register :: Parser StorageLocation
+explicit_register = ((try $ explicit_location ".a" A) <|>
+                     (try $ explicit_location ".x" X) <|>
+                     (explicit_location ".y" Y))
+
 register_location :: Parser AddressingModality
 register_location = do
-    string "@"    --- ARGH
+    z <- explicit_register
     spaces
-    return $ Implicitly A
+    return $ Implicitly z
 
 immediate :: Parser AddressingModality
 immediate = do
@@ -312,15 +325,15 @@ inc :: Parser Instruction
 inc = do
     string "inc"
     spaces
-    l <- locationName
-    return (DELTA (NamedLocation Nothing l) 1)
+    l <- named_location
+    return (DELTA l 1)
 
 dec :: Parser Instruction
 dec = do
     string "dec"
     spaces
-    l <- locationName
-    return (DELTA (NamedLocation Nothing l) (-1))
+    l <- named_location
+    return (DELTA l (-1))
 
 cmp :: Parser Instruction
 cmp = do
@@ -429,15 +442,15 @@ stx :: Parser Instruction
 stx = do
     string "stx"
     spaces
-    l <- locationName
-    return (COPY X (NamedLocation Nothing l))
+    l <- named_location
+    return (COPY X l)
 
 sty :: Parser Instruction
 sty = do
     string "sty"
     spaces
-    l <- locationName
-    return (COPY Y (NamedLocation Nothing l))
+    l <- named_location
+    return (COPY Y l)
 
 txa :: Parser Instruction
 txa = do
@@ -490,10 +503,10 @@ jmp = do
     spaces
     string "("
     spaces
-    l <- locationName
+    l <- named_location
     string ")"
     spaces
-    return $ JMPVECTOR (NamedLocation Nothing l)
+    return $ JMPVECTOR l
 
 jsr :: Parser Instruction
 jsr = do
@@ -542,7 +555,7 @@ copy_routine_statement = do
     src <- routineName
     string "to"
     spaces
-    dst <- locationName
+    dst <- location_name
     return (COPYROUTINE src (NamedLocation Nothing dst))
 
 branch :: Parser Branch
@@ -563,13 +576,18 @@ routineName = do
     spaces
     return (c:cs)
 
-locationName :: Parser String
-locationName = do
+location_name :: Parser String
+location_name = do
     c <- letter
     cs <- many (alphaNum <|> char '_')
     spaces
     return (c:cs)
 
+named_location :: Parser StorageLocation
+named_location = do
+    name <- location_name
+    return (NamedLocation Nothing name)
+
 address = hex_address <|> decimal_address
 
 hex_address :: Parser Address