jaseg/gerbonara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for unary minus operator on macro parsing

Browse source
This commit is contained in:
Paulo Henrique Silva 2015-03-06 15:00:16 -03:00
parent 68619d4d5a
commit f6dbe87c03
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gerber/am_read.py
View file

@ -126,6 +126,9 @@ def read_macro(macro):
equation_left_side = 0
primitive_code = 0
unary_minus_allowed = False
unary_minus = False
if Token.EQUALS in block:
is_equation = True
else:
@ -159,7 +162,14 @@ def read_macro(macro):
while not empty():
instructions.append((token_to_opcode(pop()), None))
unary_minus_allowed = True
elif c in Token.OPERATORS:
if c == Token.SUB and unary_minus_allowed:
unary_minus = True
unary_minus_allowed = False
continue
while not empty() and is_op(top()) and precedence(top()) >= precedence(c):
instructions.append((token_to_opcode(pop()), None))
@ -204,8 +214,12 @@ def read_macro(macro):
if is_primitive and not found_primitive_code:
primitive_code = scanner.readint()
else:
instructions.append((OpCode.PUSH, scanner.readfloat()))
n = scanner.readfloat()
if unary_minus:
unary_minus = False
n *= -1
instructions.append((OpCode.PUSH, n))
else:
# whitespace or unknown char
pass