, instructions :: [Instruction]}
deriving (Show, Eq)
-
testInstructions = "cpy 2 a\n\
\tgl a\n\
\tgl a\n\
\dec a\n\
\dec a"
-
emptyMachine :: Machine
emptyMachine = Machine {a=0, b=0, c=0, d=0, pc=0, instructions=[]}
instructionFile = instructionLine `sepEndBy` newline
instructionLine = incL <|> decL <|> cpyL <|> jnzL <|> tglL
-incL = (Inc . Register) <$> (string "inc" *> spaces *> (oneOf "abcd"))
-decL = (Dec . Register) <$> (string "dec" *> spaces *> (oneOf "abcd"))
-cpyL = cpyify <$> (string "cpy" *> spaces *> ((Literal <$> int) <|> ((Register . head) <$> (many1 letter))))
- <*> (spaces *> (oneOf "abcd"))
- where cpyify s r = Cpy s (Register r)
-jnzL = jnzify <$> (string "jnz" *> spaces *> ((Literal <$> int) <|> ((Register . head) <$> (many1 letter))))
- <*> (spaces *> ((Literal <$> int) <|> ((Register . head) <$> (many1 letter))))
- where jnzify r o = Jnz r o
-tglL = Tgl <$> (string "tgl" *> spaces *> ((Literal <$> int) <|> ((Register . head) <$> (many1 letter))))
+incL = Inc <$> (string "inc" *> spaces *> register)
+decL = Dec <$> (string "dec" *> spaces *> register)
+cpyL = Cpy <$> (string "cpy" *> spaces *> location) <*> (spaces *> register)
+jnzL = Jnz <$> (string "jnz" *> spaces *> location) <*> (spaces *> location)
+tglL = Tgl <$> (string "tgl" *> spaces *> location)
+
+location = (Literal <$> int) <|> register
+register = Register <$> (oneOf "abcd")
parseIfile :: String -> Either ParseError [Instruction]
parseIfile input = parse instructionFile "(unknown)" input
successfulParse :: Either ParseError [a] -> [a]
successfulParse (Left _) = []
-successfulParse (Right a) = a
\ No newline at end of file
+successfulParse (Right a) = a