Merge branch 'master' of github.com:taddeus/peephole

Conflicts:
	src/optimize.py

src/parser.py

@@ -3,11 +3,13 @@ import ply.yacc as yacc
 
 from statement import Statement as S, Block
 
+
 # Global statements administration
 statements = []
 
 tokens = ('NEWLINE', 'WORD', 'COMMENT', 'DIRECTIVE', 'COMMA', 'COLON')
 
+
 # Tokens
 def t_NEWLINE(t):
     r'\n+'
@@ -32,7 +34,7 @@ def t_DIRECTIVE(t):
     return t
 
 def t_hex_word(t):
-    r'0x[0-9a-fA-F]{8}'
+    r'0x([0-9a-fA-F]{8}|[0-9a-fA-F]{4})'
     t.type = 'WORD'
     return t
 
@@ -47,9 +49,10 @@ def t_int(t):
     return t
 
 def t_WORD(t):
-    r'[a-zA-Z0-9$_.+()]+'
+    r'[a-zA-Z0-9$_.+()-]+'
     return t
 
+
 # Ignore whitespaces
 t_ignore = ' \t'
 
@@ -57,9 +60,11 @@ def t_error(t):
     print('Illegal character "%s"' % t.value[0])
     t.lexer.skip(1)
 
+
 # Build the lexer
 lexer = lex.lex()
 
+
 # Parsing rules
 start = 'input'
 
@@ -102,9 +107,14 @@ def p_command(p):
 def p_error(p):
     print 'Syntax error at "%s" on line %d' % (p.value, lexer.lineno)
 
+
+# Build YACC
 yacc.yacc()
 
+
 def parse_file(filename):
+    """Parse a given Assembly file, return a Block with Statement objects
+    containing the parsed instructions."""
     global statements
 
     statements = []