rekahsoft
/
hack-asm
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up spacing 

Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
This commit is contained in:
Collin J. Doering 2016-01-06 18:05:55 -05:00
parent 48a171e6c9
commit e85ff2b949
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lib/RekahSoft/HackAsm/Parser.hs
View File

@ -109,33 +109,33 @@ cInstrJump = char 'J' >>
-- | TODO: Documentation -- | TODO: Documentation
cInstrAluOps :: GenParser Char st (String, String) cInstrAluOps :: GenParser Char st (String, String)
cInstrAluOps = cInstrAluOps =
choice [ char '0' >> return ("0", "0101010") choice [ char '0' >> return ("0", "0101010")
, char '1' >> return ("1", "0111111") , char '1' >> return ("1", "0111111")
, char '-' >> , char '-' >>
choice [ char '1' >> return ("-1", "0111010") choice [ char '1' >> return ("-1", "0111010")
, char 'D' >> return ("-D", "0001111") , char 'D' >> return ("-D", "0001111")
, char 'A' >> return ("-A", "0110011") , char 'A' >> return ("-A", "0110011")
, char 'M' >> return ("-M", "1110011") ] , char 'M' >> return ("-M", "1110011") ]
, char '!' >> , char '!' >>
choice [ char 'D' >> return ("!D", "0001101") choice [ char 'D' >> return ("!D", "0001101")
, char 'A' >> return ("!A", "0110001") , char 'A' >> return ("!A", "0110001")
, char 'M' >> return ("!M", "1110001") ] , char 'M' >> return ("!M", "1110001") ]
, char 'A' >> , char 'A' >>
choice [ string "+1" >> return ("A+1", "0110111") choice [ string "+1" >> return ("A+1", "0110111")
, char '-' >> , char '-' >>
choice [ char '1' >> return ("A-1", "0110010") choice [ char '1' >> return ("A-1", "0110010")
, char 'D' >> return ("A-D", "0000111") ] , char 'D' >> return ("A-D", "0000111") ]
, return ("A", "0110000") ] , return ("A", "0110000") ]
, char 'M' >> , char 'M' >>
choice [ string "+1" >> return ("M+1", "1110111") choice [ string "+1" >> return ("M+1", "1110111")
, char '-' >> , char '-' >>
choice [ char '1' >> return ("M-1", "1110010") choice [ char '1' >> return ("M-1", "1110010")
, char 'D' >> return ("M-D", "1000111") ] , char 'D' >> return ("M-D", "1000111") ]
, return ("M", "1110000") ] , return ("M", "1110000") ]
, char 'D' >> , char 'D' >>
choice [ char '+' >> choice [ char '+' >>
@ -152,7 +152,7 @@ cInstrAluOps =
, char '|' >> , char '|' >>
choice [ char 'A' >> return ("D|A", "0010101") choice [ char 'A' >> return ("D|A", "0010101")
, char 'M' >> return ("D|M", "1010101") ] , char 'M' >> return ("D|M", "1010101") ]
, return ("D", "0001100")] , return ("D", "0001100")]
] ]
-- | TODO: Documentation -- | TODO: Documentation