add make rules for generating debug files

1 files changed, 133 insertions, 106 deletions

diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 74c89532..df7f3585 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -178,7 +178,7 @@ LexToken(EOL,'\n',1,1450)
 LexToken(VAR,'spath',1,1467)
 LexToken(OPENBRACKET,'(',1,1472)
 LexToken(LASTINDEX,'$',1,1473)
-LexToken(OPERATOR,'+',1,1474)
+LexToken(ADDITION,'+',1,1474)
 LexToken(NUMBER,'1',1,1475)
 LexToken(CLOSEBRACKET,')',1,1476)
 LexToken(ASSIGNMENT,'=',1,1477)
@@ -187,7 +187,7 @@ LexToken(EOL,'\n',1,1485)
 LexToken(VAR,'spath',1,1502)
 LexToken(OPENBRACKET,'(',1,1507)
 LexToken(LASTINDEX,'$',1,1508)
-LexToken(OPERATOR,'+',1,1509)
+LexToken(ADDITION,'+',1,1509)
 LexToken(NUMBER,'1',1,1510)
 LexToken(CLOSEBRACKET,')',1,1511)
 LexToken(ASSIGNMENT,'=',1,1512)
@@ -196,7 +196,7 @@ LexToken(EOL,'\n',1,1519)
 LexToken(VAR,'spath',1,1536)
 LexToken(OPENBRACKET,'(',1,1541)
 LexToken(LASTINDEX,'$',1,1542)
-LexToken(OPERATOR,'+',1,1543)
+LexToken(ADDITION,'+',1,1543)
 LexToken(NUMBER,'1',1,1544)
 LexToken(CLOSEBRACKET,')',1,1545)
 LexToken(ASSIGNMENT,'=',1,1546)
@@ -205,7 +205,7 @@ LexToken(EOL,'\n',1,1553)
 LexToken(VAR,'spath',1,1570)
 LexToken(OPENBRACKET,'(',1,1575)
 LexToken(LASTINDEX,'$',1,1576)
-LexToken(OPERATOR,'+',1,1577)
+LexToken(ADDITION,'+',1,1577)
 LexToken(NUMBER,'1',1,1578)
 LexToken(CLOSEBRACKET,')',1,1579)
 LexToken(ASSIGNMENT,'=',1,1580)
@@ -226,11 +226,11 @@ LexToken(EOL,'\n',1,1648)
 LexToken(VAR,'execstr',1,1661)
 LexToken(OPENBRACKET,'(',1,1668)
 LexToken(DQSTRING,'"xxn="',1,1674)
-LexToken(OPERATOR,'+',1,1675)
+LexToken(ADDITION,'+',1,1675)
 LexToken(VAR,'xx',1,1676)
 LexToken(DOT,'.',1,1678)
 LexToken(VAR,'gui',1,1679)
-LexToken(OPERATOR,'+',1,1682)
+LexToken(ADDITION,'+',1,1682)
 LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1696)
 LexToken(CLOSEBRACKET,')',1,1697)
 LexToken(EOL,'\n',1,1698)
@@ -723,7 +723,7 @@ LexToken(VAR,'size',1,4277)
 LexToken(OPENBRACKET,'(',1,4281)
 LexToken(VAR,'newpar',1,4282)
 LexToken(CLOSEBRACKET,')',1,4288)
-LexToken(OPERATOR,'+',1,4289)
+LexToken(ADDITION,'+',1,4289)
 LexToken(NUMBER,'1',1,4290)
 LexToken(CLOSEBRACKET,')',1,4291)
 LexToken(ASSIGNMENT,'=',1,4292)
@@ -800,7 +800,8 @@ LexToken(NUMBER,'0.000001',1,4634)
 LexToken(SEMICOLON,';',1,4642)
 LexToken(NUMBER,'1.000',1,4643)
 LexToken(VAR,'D',1,4648)
-LexToken(NUMBER,'-10',1,4649)
+LexToken(ADDITION,'-',1,4649)
+LexToken(NUMBER,'10',1,4650)
 LexToken(SEMICOLON,';',1,4652)
 LexToken(NUMBER,'100001',1,4653)
 LexToken(SEMICOLON,';',1,4659)
@@ -1071,7 +1072,8 @@ LexToken(NUMBER,'10',1,5650)
 LexToken(SEMICOLON,';',1,5652)
 LexToken(NUMBER,'20',1,5653)
 LexToken(SEMICOLON,';',1,5655)
-LexToken(NUMBER,'-30',1,5656)
+LexToken(ADDITION,'-',1,5656)
+LexToken(NUMBER,'30',1,5657)
 LexToken(CLOSESQBRACKET,']',1,5659)
 LexToken(COMMA,',',1,5660)
 LexToken(VAR,'ipar',1,5672)
@@ -1174,7 +1176,8 @@ LexToken(ASSIGNMENT,'=',1,6060)
 LexToken(OPENSQBRACKET,'[',1,6061)
 LexToken(NUMBER,'5',1,6062)
 LexToken(COMMA,',',1,6063)
-LexToken(NUMBER,'-1',1,6064)
+LexToken(ADDITION,'-',1,6064)
+LexToken(NUMBER,'1',1,6065)
 LexToken(CLOSESQBRACKET,']',1,6066)
 LexToken(COMMA,',',1,6067)
 LexToken(VAR,'from',1,6079)
@@ -1476,7 +1479,8 @@ LexToken(ASSIGNMENT,'=',1,7312)
 LexToken(OPENSQBRACKET,'[',1,7313)
 LexToken(NUMBER,'5',1,7314)
 LexToken(COMMA,',',1,7315)
-LexToken(NUMBER,'-1',1,7316)
+LexToken(ADDITION,'-',1,7316)
+LexToken(NUMBER,'1',1,7317)
 LexToken(CLOSESQBRACKET,']',1,7318)
 LexToken(COMMA,',',1,7319)
 LexToken(VAR,'from',1,7331)
@@ -1593,15 +1597,18 @@ LexToken(DQSTRING,'"output"',1,7800)
 LexToken(COMMA,',',1,7801)
 LexToken(VAR,'in',1,7813)
 LexToken(ASSIGNMENT,'=',1,7815)
-LexToken(NUMBER,'-1',1,7816)
+LexToken(ADDITION,'-',1,7816)
+LexToken(NUMBER,'1',1,7817)
 LexToken(COMMA,',',1,7818)
 LexToken(VAR,'in2',1,7830)
 LexToken(ASSIGNMENT,'=',1,7833)
-LexToken(NUMBER,'-2',1,7834)
+LexToken(ADDITION,'-',1,7834)
+LexToken(NUMBER,'2',1,7835)
 LexToken(COMMA,',',1,7836)
 LexToken(VAR,'intyp',1,7848)
 LexToken(ASSIGNMENT,'=',1,7853)
-LexToken(NUMBER,'-1',1,7854)
+LexToken(ADDITION,'-',1,7854)
+LexToken(NUMBER,'1',1,7855)
 LexToken(COMMA,',',1,7856)
 LexToken(VAR,'out',1,7868)
 LexToken(ASSIGNMENT,'=',1,7871)
@@ -2012,7 +2019,8 @@ LexToken(ASSIGNMENT,'=',1,9558)
 LexToken(OPENSQBRACKET,'[',1,9559)
 LexToken(NUMBER,'5',1,9560)
 LexToken(COMMA,',',1,9561)
-LexToken(NUMBER,'-1',1,9562)
+LexToken(ADDITION,'-',1,9562)
+LexToken(NUMBER,'1',1,9563)
 LexToken(CLOSESQBRACKET,']',1,9564)
 LexToken(COMMA,',',1,9565)
 LexToken(VAR,'from',1,9577)
@@ -2060,7 +2068,8 @@ LexToken(NUMBER,'1',1,9716)
 LexToken(COMMA,',',1,9717)
 LexToken(VAR,'out',1,9729)
 LexToken(ASSIGNMENT,'=',1,9732)
-LexToken(NUMBER,'-1',1,9733)
+LexToken(ADDITION,'-',1,9733)
+LexToken(NUMBER,'1',1,9734)
 LexToken(COMMA,',',1,9735)
 LexToken(VAR,'out2',1,9747)
 LexToken(ASSIGNMENT,'=',1,9751)
@@ -2252,7 +2261,8 @@ LexToken(ASSIGNMENT,'=',1,10426)
 LexToken(NUMBER,'1',1,10427)
 LexToken(COLON,':',1,10428)
 LexToken(VAR,'N',1,10429)
-LexToken(NUMBER,'-1',1,10430)
+LexToken(ADDITION,'-',1,10430)
+LexToken(NUMBER,'1',1,10431)
 LexToken(EOL,'\n',1,10432)
 LexToken(VAR,'X',1,10445)
 LexToken(ASSIGNMENT,'=',1,10446)
@@ -2267,14 +2277,14 @@ LexToken(SEMICOLON,';',1,10454)
 LexToken(VAR,'x',1,10455)
 LexToken(OPENBRACKET,'(',1,10456)
 LexToken(VAR,'i',1,10457)
-LexToken(OPERATOR,'+',1,10458)
+LexToken(ADDITION,'+',1,10458)
 LexToken(NUMBER,'1',1,10459)
 LexToken(CLOSEBRACKET,')',1,10460)
 LexToken(SEMICOLON,';',1,10461)
 LexToken(VAR,'x',1,10462)
 LexToken(OPENBRACKET,'(',1,10463)
 LexToken(VAR,'i',1,10464)
-LexToken(OPERATOR,'+',1,10465)
+LexToken(ADDITION,'+',1,10465)
 LexToken(NUMBER,'1',1,10466)
 LexToken(CLOSEBRACKET,')',1,10467)
 LexToken(CLOSESQBRACKET,']',1,10468)
@@ -2298,7 +2308,7 @@ LexToken(SEMICOLON,';',1,10497)
 LexToken(VAR,'y',1,10498)
 LexToken(OPENBRACKET,'(',1,10499)
 LexToken(VAR,'i',1,10500)
-LexToken(OPERATOR,'+',1,10501)
+LexToken(ADDITION,'+',1,10501)
 LexToken(NUMBER,'1',1,10502)
 LexToken(CLOSEBRACKET,')',1,10503)
 LexToken(CLOSESQBRACKET,']',1,10504)
@@ -2429,7 +2439,8 @@ LexToken(ASSIGNMENT,'=',1,11020)
 LexToken(NUMBER,'1',1,11021)
 LexToken(COLON,':',1,11022)
 LexToken(VAR,'N',1,11023)
-LexToken(NUMBER,'-1',1,11024)
+LexToken(ADDITION,'-',1,11024)
+LexToken(NUMBER,'1',1,11025)
 LexToken(EOL,'\n',1,11026)
 LexToken(VAR,'X',1,11035)
 LexToken(ASSIGNMENT,'=',1,11036)
@@ -2446,12 +2457,12 @@ LexToken(COMMA,',',1,11053)
 LexToken(VAR,'x',1,11054)
 LexToken(OPENBRACKET,'(',1,11055)
 LexToken(VAR,'i',1,11056)
-LexToken(OPERATOR,'+',1,11057)
+LexToken(ADDITION,'+',1,11057)
 LexToken(NUMBER,'1',1,11058)
 LexToken(CLOSEBRACKET,')',1,11059)
 LexToken(COMMA,',',1,11060)
 LexToken(VAR,'NP',1,11061)
-LexToken(OPERATOR,'+',1,11063)
+LexToken(ADDITION,'+',1,11063)
 LexToken(NUMBER,'2',1,11064)
 LexToken(CLOSEBRACKET,')',1,11065)
 LexToken(TRANSPOSE,"'",1,11066)
@@ -2492,7 +2503,8 @@ LexToken(OPENBRACKET,'(',1,11246)
 LexToken(NUMBER,'1',1,11247)
 LexToken(COLON,':',1,11248)
 LexToken(VAR,'N',1,11249)
-LexToken(NUMBER,'-1',1,11250)
+LexToken(ADDITION,'-',1,11250)
+LexToken(NUMBER,'1',1,11251)
 LexToken(CLOSEBRACKET,')',1,11252)
 LexToken(SEMICOLON,';',1,11253)
 LexToken(EOL,'\n',1,11254)
@@ -2503,9 +2515,10 @@ LexToken(OPENBRACKET,'(',1,11266)
 LexToken(VAR,'N',1,11267)
 LexToken(COLON,':',1,11268)
 LexToken(NUMBER,'2',1,11269)
-LexToken(OPERATOR,'*',1,11270)
+LexToken(MULTIPLICATION,'*',1,11270)
 LexToken(VAR,'N',1,11271)
-LexToken(NUMBER,'-2',1,11272)
+LexToken(ADDITION,'-',1,11272)
+LexToken(NUMBER,'2',1,11273)
 LexToken(CLOSEBRACKET,')',1,11274)
 LexToken(SEMICOLON,';',1,11275)
 LexToken(EOL,'\n',1,11276)
@@ -2514,14 +2527,16 @@ LexToken(ASSIGNMENT,'=',1,11286)
 LexToken(VAR,'Z',1,11287)
 LexToken(OPENBRACKET,'(',1,11288)
 LexToken(NUMBER,'2',1,11289)
-LexToken(OPERATOR,'*',1,11290)
+LexToken(MULTIPLICATION,'*',1,11290)
 LexToken(VAR,'N',1,11291)
-LexToken(NUMBER,'-1',1,11292)
+LexToken(ADDITION,'-',1,11292)
+LexToken(NUMBER,'1',1,11293)
 LexToken(COLON,':',1,11294)
 LexToken(NUMBER,'3',1,11295)
-LexToken(OPERATOR,'*',1,11296)
+LexToken(MULTIPLICATION,'*',1,11296)
 LexToken(VAR,'N',1,11297)
-LexToken(NUMBER,'-3',1,11298)
+LexToken(ADDITION,'-',1,11298)
+LexToken(NUMBER,'3',1,11299)
 LexToken(CLOSEBRACKET,')',1,11300)
 LexToken(SEMICOLON,';',1,11301)
 LexToken(EOL,'\n',1,11302)
@@ -2542,9 +2557,11 @@ LexToken(FOR,'for',1,11344)
 LexToken(VAR,'i',1,11348)
 LexToken(ASSIGNMENT,'=',1,11349)
 LexToken(VAR,'N',1,11350)
-LexToken(NUMBER,'-1',1,11351)
+LexToken(ADDITION,'-',1,11351)
+LexToken(NUMBER,'1',1,11352)
 LexToken(COLON,':',1,11353)
-LexToken(NUMBER,'-1',1,11354)
+LexToken(ADDITION,'-',1,11354)
+LexToken(NUMBER,'1',1,11355)
 LexToken(COLON,':',1,11356)
 LexToken(NUMBER,'1',1,11357)
 LexToken(EOL,'\n',1,11358)
@@ -2575,38 +2592,38 @@ LexToken(VAR,'A',1,11437)
 LexToken(OPENBRACKET,'(',1,11438)
 LexToken(VAR,'i',1,11439)
 LexToken(CLOSEBRACKET,')',1,11440)
-LexToken(OPERATOR,'*',1,11441)
+LexToken(MULTIPLICATION,'*',1,11441)
 LexToken(OPENBRACKET,'(',1,11442)
 LexToken(VAR,'X',1,11443)
 LexToken(OPENBRACKET,'(',1,11444)
 LexToken(VAR,'j',1,11445)
 LexToken(CLOSEBRACKET,')',1,11446)
-LexToken(OPERATOR,'-',1,11447)
+LexToken(ADDITION,'-',1,11447)
 LexToken(VAR,'x',1,11448)
 LexToken(OPENBRACKET,'(',1,11449)
 LexToken(VAR,'i',1,11450)
 LexToken(CLOSEBRACKET,')',1,11451)
 LexToken(CLOSEBRACKET,')',1,11452)
-LexToken(OPERATOR,'^',1,11453)
+LexToken(MULTIPLICATION,'^',1,11453)
 LexToken(NUMBER,'2',1,11454)
-LexToken(OPERATOR,'+',1,11455)
+LexToken(ADDITION,'+',1,11455)
 LexToken(VAR,'B',1,11456)
 LexToken(OPENBRACKET,'(',1,11457)
 LexToken(VAR,'i',1,11458)
 LexToken(CLOSEBRACKET,')',1,11459)
-LexToken(OPERATOR,'*',1,11460)
+LexToken(MULTIPLICATION,'*',1,11460)
 LexToken(OPENBRACKET,'(',1,11461)
 LexToken(VAR,'X',1,11462)
 LexToken(OPENBRACKET,'(',1,11463)
 LexToken(VAR,'j',1,11464)
 LexToken(CLOSEBRACKET,')',1,11465)
-LexToken(OPERATOR,'-',1,11466)
+LexToken(ADDITION,'-',1,11466)
 LexToken(VAR,'x',1,11467)
 LexToken(OPENBRACKET,'(',1,11468)
 LexToken(VAR,'i',1,11469)
 LexToken(CLOSEBRACKET,')',1,11470)
 LexToken(CLOSEBRACKET,')',1,11471)
-LexToken(OPERATOR,'+',1,11472)
+LexToken(ADDITION,'+',1,11472)
 LexToken(VAR,'C',1,11473)
 LexToken(OPENBRACKET,'(',1,11474)
 LexToken(VAR,'i',1,11475)
@@ -2621,7 +2638,8 @@ LexToken(VAR,'matrix',1,11505)
 LexToken(OPENBRACKET,'(',1,11511)
 LexToken(VAR,'Z',1,11512)
 LexToken(COMMA,',',1,11513)
-LexToken(NUMBER,'-1',1,11514)
+LexToken(ADDITION,'-',1,11514)
+LexToken(NUMBER,'1',1,11515)
 LexToken(COMMA,',',1,11516)
 LexToken(NUMBER,'1',1,11517)
 LexToken(CLOSEBRACKET,')',1,11518)
@@ -2678,7 +2696,7 @@ LexToken(EOL,'\n',1,11732)
 LexToken(VAR,'xinfo',1,11745)
 LexToken(OPENBRACKET,'(',1,11750)
 LexToken(DQSTRING,'"ERROR in SPLINE: "',1,11769)
-LexToken(OPERATOR,'+',1,11770)
+LexToken(ADDITION,'+',1,11770)
 LexToken(VAR,'METHOD',1,11771)
 LexToken(CLOSEBRACKET,')',1,11777)
 LexToken(EOL,'\n',1,11778)
@@ -2761,7 +2779,7 @@ LexToken(EOL,'\n',1,12062)
 LexToken(VAR,'xinfo',1,12075)
 LexToken(OPENBRACKET,'(',1,12080)
 LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12099)
-LexToken(OPERATOR,'+',1,12100)
+LexToken(ADDITION,'+',1,12100)
 LexToken(VAR,'METHOD',1,12101)
 LexToken(CLOSEBRACKET,')',1,12107)
 LexToken(EOL,'\n',1,12108)
@@ -2819,7 +2837,7 @@ LexToken(EOL,'\n',1,12332)
 LexToken(VAR,'xinfo',1,12345)
 LexToken(OPENBRACKET,'(',1,12350)
 LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12369)
-LexToken(OPERATOR,'+',1,12370)
+LexToken(ADDITION,'+',1,12370)
 LexToken(VAR,'METHOD',1,12371)
 LexToken(CLOSEBRACKET,')',1,12377)
 LexToken(EOL,'\n',1,12378)
@@ -2878,7 +2896,7 @@ LexToken(EOL,'\n',1,12598)
 LexToken(VAR,'xinfo',1,12611)
 LexToken(OPENBRACKET,'(',1,12616)
 LexToken(DQSTRING,'"ERROR in SPLINE:  "',1,12636)
-LexToken(OPERATOR,'+',1,12637)
+LexToken(ADDITION,'+',1,12637)
 LexToken(VAR,'METHOD',1,12638)
 LexToken(CLOSEBRACKET,')',1,12644)
 LexToken(EOL,'\n',1,12645)
@@ -2942,7 +2960,7 @@ LexToken(EOL,'\n',1,12873)
 LexToken(VAR,'xinfo',1,12886)
 LexToken(OPENBRACKET,'(',1,12891)
 LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12910)
-LexToken(OPERATOR,'+',1,12911)
+LexToken(ADDITION,'+',1,12911)
 LexToken(VAR,'METHOD',1,12912)
 LexToken(CLOSEBRACKET,')',1,12918)
 LexToken(EOL,'\n',1,12919)
@@ -3055,7 +3073,8 @@ LexToken(VAR,'x',1,13338)
 LexToken(COMMA,',',1,13339)
 LexToken(DQSTRING,'"*"',1,13342)
 LexToken(CLOSEBRACKET,')',1,13343)
-LexToken(NUMBER,'-1',1,13344)
+LexToken(ADDITION,'-',1,13344)
+LexToken(NUMBER,'1',1,13345)
 LexToken(SEMICOLON,';',1,13346)
 LexToken(EOL,'\n',1,13347)
 LexToken(VAR,'A',1,13352)
@@ -3063,12 +3082,13 @@ LexToken(ASSIGNMENT,'=',1,13353)
 LexToken(VAR,'zeros',1,13354)
 LexToken(OPENBRACKET,'(',1,13359)
 LexToken(NUMBER,'3',1,13360)
-LexToken(OPERATOR,'*',1,13361)
+LexToken(MULTIPLICATION,'*',1,13361)
 LexToken(VAR,'N',1,13362)
-LexToken(NUMBER,'-1',1,13363)
+LexToken(ADDITION,'-',1,13363)
+LexToken(NUMBER,'1',1,13364)
 LexToken(COMMA,',',1,13365)
 LexToken(VAR,'N',1,13366)
-LexToken(OPERATOR,'*',1,13367)
+LexToken(MULTIPLICATION,'*',1,13367)
 LexToken(NUMBER,'3',1,13368)
 LexToken(CLOSEBRACKET,')',1,13369)
 LexToken(SEMICOLON,';',1,13370)
@@ -3078,9 +3098,10 @@ LexToken(ASSIGNMENT,'=',1,13377)
 LexToken(VAR,'zeros',1,13378)
 LexToken(OPENBRACKET,'(',1,13383)
 LexToken(NUMBER,'3',1,13384)
-LexToken(OPERATOR,'*',1,13385)
+LexToken(MULTIPLICATION,'*',1,13385)
 LexToken(VAR,'N',1,13386)
-LexToken(NUMBER,'-1',1,13387)
+LexToken(ADDITION,'-',1,13387)
+LexToken(NUMBER,'1',1,13388)
 LexToken(COMMA,',',1,13389)
 LexToken(NUMBER,'1',1,13390)
 LexToken(CLOSEBRACKET,')',1,13391)
@@ -3096,12 +3117,13 @@ LexToken(EOL,'\n',1,13407)
 LexToken(VAR,'j',1,13416)
 LexToken(ASSIGNMENT,'=',1,13417)
 LexToken(NUMBER,'3',1,13418)
-LexToken(OPERATOR,'*',1,13419)
+LexToken(MULTIPLICATION,'*',1,13419)
 LexToken(OPENBRACKET,'(',1,13420)
 LexToken(VAR,'i',1,13421)
-LexToken(NUMBER,'-1',1,13422)
+LexToken(ADDITION,'-',1,13422)
+LexToken(NUMBER,'1',1,13423)
 LexToken(CLOSEBRACKET,')',1,13424)
-LexToken(OPERATOR,'+',1,13425)
+LexToken(ADDITION,'+',1,13425)
 LexToken(NUMBER,'1',1,13426)
 LexToken(SEMICOLON,';',1,13427)
 LexToken(EOL,'\n',1,13428)
@@ -3110,9 +3132,9 @@ LexToken(OPENBRACKET,'(',1,13438)
 LexToken(VAR,'j',1,13439)
 LexToken(COMMA,',',1,13440)
 LexToken(VAR,'i',1,13441)
-LexToken(OPERATOR,'+',1,13442)
+LexToken(ADDITION,'+',1,13442)
 LexToken(NUMBER,'2',1,13443)
-LexToken(OPERATOR,'*',1,13444)
+LexToken(MULTIPLICATION,'*',1,13444)
 LexToken(VAR,'N',1,13445)
 LexToken(CLOSEBRACKET,')',1,13446)
 LexToken(ASSIGNMENT,'=',1,13447)
@@ -3133,7 +3155,7 @@ LexToken(EOL,'\n',1,13469)
 LexToken(VAR,'A',1,13478)
 LexToken(OPENBRACKET,'(',1,13479)
 LexToken(VAR,'j',1,13480)
-LexToken(OPERATOR,'+',1,13481)
+LexToken(ADDITION,'+',1,13481)
 LexToken(NUMBER,'1',1,13482)
 LexToken(COMMA,',',1,13483)
 LexToken(VAR,'i',1,13484)
@@ -3143,37 +3165,37 @@ LexToken(OPENBRACKET,'(',1,13487)
 LexToken(VAR,'x',1,13488)
 LexToken(OPENBRACKET,'(',1,13489)
 LexToken(VAR,'i',1,13490)
-LexToken(OPERATOR,'+',1,13491)
+LexToken(ADDITION,'+',1,13491)
 LexToken(NUMBER,'1',1,13492)
 LexToken(CLOSEBRACKET,')',1,13493)
-LexToken(OPERATOR,'-',1,13494)
+LexToken(ADDITION,'-',1,13494)
 LexToken(VAR,'x',1,13495)
 LexToken(OPENBRACKET,'(',1,13496)
 LexToken(VAR,'i',1,13497)
 LexToken(CLOSEBRACKET,')',1,13498)
 LexToken(CLOSEBRACKET,')',1,13499)
-LexToken(OPERATOR,'^',1,13500)
+LexToken(MULTIPLICATION,'^',1,13500)
 LexToken(NUMBER,'2',1,13501)
 LexToken(SEMICOLON,';',1,13502)
 LexToken(EOL,'\n',1,13503)
 LexToken(VAR,'A',1,13512)
 LexToken(OPENBRACKET,'(',1,13513)
 LexToken(VAR,'j',1,13514)
-LexToken(OPERATOR,'+',1,13515)
+LexToken(ADDITION,'+',1,13515)
 LexToken(NUMBER,'1',1,13516)
 LexToken(COMMA,',',1,13517)
 LexToken(VAR,'i',1,13518)
-LexToken(OPERATOR,'+',1,13519)
+LexToken(ADDITION,'+',1,13519)
 LexToken(VAR,'N',1,13520)
 LexToken(CLOSEBRACKET,')',1,13521)
 LexToken(ASSIGNMENT,'=',1,13522)
 LexToken(VAR,'x',1,13523)
 LexToken(OPENBRACKET,'(',1,13524)
 LexToken(VAR,'i',1,13525)
-LexToken(OPERATOR,'+',1,13526)
+LexToken(ADDITION,'+',1,13526)
 LexToken(NUMBER,'1',1,13527)
 LexToken(CLOSEBRACKET,')',1,13528)
-LexToken(OPERATOR,'-',1,13529)
+LexToken(ADDITION,'-',1,13529)
 LexToken(VAR,'x',1,13530)
 LexToken(OPENBRACKET,'(',1,13531)
 LexToken(VAR,'i',1,13532)
@@ -3183,13 +3205,13 @@ LexToken(EOL,'\n',1,13535)
 LexToken(VAR,'A',1,13544)
 LexToken(OPENBRACKET,'(',1,13545)
 LexToken(VAR,'j',1,13546)
-LexToken(OPERATOR,'+',1,13547)
+LexToken(ADDITION,'+',1,13547)
 LexToken(NUMBER,'1',1,13548)
 LexToken(COMMA,',',1,13549)
 LexToken(VAR,'i',1,13550)
-LexToken(OPERATOR,'+',1,13551)
+LexToken(ADDITION,'+',1,13551)
 LexToken(NUMBER,'2',1,13552)
-LexToken(OPERATOR,'*',1,13553)
+LexToken(MULTIPLICATION,'*',1,13553)
 LexToken(VAR,'N',1,13554)
 LexToken(CLOSEBRACKET,')',1,13555)
 LexToken(ASSIGNMENT,'=',1,13556)
@@ -3199,14 +3221,14 @@ LexToken(EOL,'\n',1,13559)
 LexToken(VAR,'B',1,13568)
 LexToken(OPENBRACKET,'(',1,13569)
 LexToken(VAR,'j',1,13570)
-LexToken(OPERATOR,'+',1,13571)
+LexToken(ADDITION,'+',1,13571)
 LexToken(NUMBER,'1',1,13572)
 LexToken(CLOSEBRACKET,')',1,13573)
 LexToken(ASSIGNMENT,'=',1,13574)
 LexToken(VAR,'y',1,13575)
 LexToken(OPENBRACKET,'(',1,13576)
 LexToken(VAR,'i',1,13577)
-LexToken(OPERATOR,'+',1,13578)
+LexToken(ADDITION,'+',1,13578)
 LexToken(NUMBER,'1',1,13579)
 LexToken(CLOSEBRACKET,')',1,13580)
 LexToken(SEMICOLON,';',1,13581)
@@ -3220,39 +3242,41 @@ LexToken(ASSIGNMENT,'=',1,13601)
 LexToken(NUMBER,'1',1,13602)
 LexToken(COLON,':',1,13603)
 LexToken(VAR,'N',1,13604)
-LexToken(NUMBER,'-1',1,13605)
+LexToken(ADDITION,'-',1,13605)
+LexToken(NUMBER,'1',1,13606)
 LexToken(EOL,'\n',1,13607)
 LexToken(VAR,'j',1,13616)
 LexToken(ASSIGNMENT,'=',1,13617)
 LexToken(NUMBER,'3',1,13618)
-LexToken(OPERATOR,'*',1,13619)
+LexToken(MULTIPLICATION,'*',1,13619)
 LexToken(OPENBRACKET,'(',1,13620)
 LexToken(VAR,'i',1,13621)
-LexToken(NUMBER,'-1',1,13622)
+LexToken(ADDITION,'-',1,13622)
+LexToken(NUMBER,'1',1,13623)
 LexToken(CLOSEBRACKET,')',1,13624)
-LexToken(OPERATOR,'+',1,13625)
+LexToken(ADDITION,'+',1,13625)
 LexToken(NUMBER,'1',1,13626)
 LexToken(SEMICOLON,';',1,13627)
 LexToken(EOL,'\n',1,13628)
 LexToken(VAR,'A',1,13637)
 LexToken(OPENBRACKET,'(',1,13638)
 LexToken(VAR,'j',1,13639)
-LexToken(OPERATOR,'+',1,13640)
+LexToken(ADDITION,'+',1,13640)
 LexToken(NUMBER,'2',1,13641)
 LexToken(COMMA,',',1,13642)
 LexToken(VAR,'i',1,13643)
 LexToken(CLOSEBRACKET,')',1,13644)
 LexToken(ASSIGNMENT,'=',1,13645)
 LexToken(NUMBER,'2',1,13646)
-LexToken(OPERATOR,'*',1,13647)
+LexToken(MULTIPLICATION,'*',1,13647)
 LexToken(OPENBRACKET,'(',1,13648)
 LexToken(VAR,'x',1,13649)
 LexToken(OPENBRACKET,'(',1,13650)
 LexToken(VAR,'i',1,13651)
-LexToken(OPERATOR,'+',1,13652)
+LexToken(ADDITION,'+',1,13652)
 LexToken(NUMBER,'1',1,13653)
 LexToken(CLOSEBRACKET,')',1,13654)
-LexToken(OPERATOR,'-',1,13655)
+LexToken(ADDITION,'-',1,13655)
 LexToken(VAR,'x',1,13656)
 LexToken(OPENBRACKET,'(',1,13657)
 LexToken(VAR,'i',1,13658)
@@ -3263,11 +3287,11 @@ LexToken(EOL,'\n',1,13662)
 LexToken(VAR,'A',1,13671)
 LexToken(OPENBRACKET,'(',1,13672)
 LexToken(VAR,'j',1,13673)
-LexToken(OPERATOR,'+',1,13674)
+LexToken(ADDITION,'+',1,13674)
 LexToken(NUMBER,'2',1,13675)
 LexToken(COMMA,',',1,13676)
 LexToken(VAR,'i',1,13677)
-LexToken(OPERATOR,'+',1,13678)
+LexToken(ADDITION,'+',1,13678)
 LexToken(VAR,'N',1,13679)
 LexToken(CLOSEBRACKET,')',1,13680)
 LexToken(ASSIGNMENT,'=',1,13681)
@@ -3277,17 +3301,18 @@ LexToken(EOL,'\n',1,13684)
 LexToken(VAR,'A',1,13693)
 LexToken(OPENBRACKET,'(',1,13694)
 LexToken(VAR,'j',1,13695)
-LexToken(OPERATOR,'+',1,13696)
+LexToken(ADDITION,'+',1,13696)
 LexToken(NUMBER,'2',1,13697)
 LexToken(COMMA,',',1,13698)
 LexToken(VAR,'i',1,13699)
-LexToken(OPERATOR,'+',1,13700)
+LexToken(ADDITION,'+',1,13700)
 LexToken(VAR,'N',1,13701)
-LexToken(OPERATOR,'+',1,13702)
+LexToken(ADDITION,'+',1,13702)
 LexToken(NUMBER,'1',1,13703)
 LexToken(CLOSEBRACKET,')',1,13704)
 LexToken(ASSIGNMENT,'=',1,13705)
-LexToken(NUMBER,'-1',1,13706)
+LexToken(ADDITION,'-',1,13706)
+LexToken(NUMBER,'1',1,13707)
 LexToken(SEMICOLON,';',1,13708)
 LexToken(EOL,'\n',1,13709)
 LexToken(END,'end',1,13714)
@@ -3298,11 +3323,11 @@ LexToken(ASSIGNMENT,'=',1,13724)
 LexToken(VAR,'zeros',1,13725)
 LexToken(OPENBRACKET,'(',1,13730)
 LexToken(NUMBER,'3',1,13731)
-LexToken(OPERATOR,'*',1,13732)
+LexToken(MULTIPLICATION,'*',1,13732)
 LexToken(VAR,'N',1,13733)
 LexToken(COMMA,',',1,13734)
 LexToken(NUMBER,'3',1,13735)
-LexToken(OPERATOR,'*',1,13736)
+LexToken(MULTIPLICATION,'*',1,13736)
 LexToken(VAR,'N',1,13737)
 LexToken(CLOSEBRACKET,')',1,13738)
 LexToken(SEMICOLON,';',1,13739)
@@ -3322,21 +3347,21 @@ LexToken(VAR,'i',1,13767)
 LexToken(CLOSEBRACKET,')',1,13768)
 LexToken(ASSIGNMENT,'=',1,13769)
 LexToken(NUMBER,'4',1,13770)
-LexToken(OPERATOR,'*',1,13771)
+LexToken(MULTIPLICATION,'*',1,13771)
 LexToken(OPENBRACKET,'(',1,13772)
 LexToken(VAR,'x',1,13773)
 LexToken(OPENBRACKET,'(',1,13774)
 LexToken(VAR,'i',1,13775)
-LexToken(OPERATOR,'+',1,13776)
+LexToken(ADDITION,'+',1,13776)
 LexToken(NUMBER,'1',1,13777)
 LexToken(CLOSEBRACKET,')',1,13778)
-LexToken(OPERATOR,'-',1,13779)
+LexToken(ADDITION,'-',1,13779)
 LexToken(VAR,'x',1,13780)
 LexToken(OPENBRACKET,'(',1,13781)
 LexToken(VAR,'i',1,13782)
 LexToken(CLOSEBRACKET,')',1,13783)
 LexToken(CLOSEBRACKET,')',1,13784)
-LexToken(OPERATOR,'^',1,13785)
+LexToken(MULTIPLICATION,'^',1,13785)
 LexToken(NUMBER,'2',1,13786)
 LexToken(EOL,'\n',1,13787)
 LexToken(VAR,'Q',1,13796)
@@ -3344,20 +3369,20 @@ LexToken(OPENBRACKET,'(',1,13797)
 LexToken(VAR,'i',1,13798)
 LexToken(COMMA,',',1,13799)
 LexToken(VAR,'i',1,13800)
-LexToken(OPERATOR,'+',1,13801)
+LexToken(ADDITION,'+',1,13801)
 LexToken(VAR,'N',1,13802)
 LexToken(CLOSEBRACKET,')',1,13803)
 LexToken(ASSIGNMENT,'=',1,13804)
 LexToken(NUMBER,'2',1,13805)
-LexToken(OPERATOR,'*',1,13806)
+LexToken(MULTIPLICATION,'*',1,13806)
 LexToken(OPENBRACKET,'(',1,13807)
 LexToken(VAR,'x',1,13808)
 LexToken(OPENBRACKET,'(',1,13809)
 LexToken(VAR,'i',1,13810)
-LexToken(OPERATOR,'+',1,13811)
+LexToken(ADDITION,'+',1,13811)
 LexToken(NUMBER,'1',1,13812)
 LexToken(CLOSEBRACKET,')',1,13813)
-LexToken(OPERATOR,'-',1,13814)
+LexToken(ADDITION,'-',1,13814)
 LexToken(VAR,'x',1,13815)
 LexToken(OPENBRACKET,'(',1,13816)
 LexToken(VAR,'i',1,13817)
@@ -3367,22 +3392,22 @@ LexToken(EOL,'\n',1,13820)
 LexToken(VAR,'Q',1,13829)
 LexToken(OPENBRACKET,'(',1,13830)
 LexToken(VAR,'i',1,13831)
-LexToken(OPERATOR,'+',1,13832)
+LexToken(ADDITION,'+',1,13832)
 LexToken(VAR,'N',1,13833)
 LexToken(COMMA,',',1,13834)
 LexToken(VAR,'i',1,13835)
 LexToken(CLOSEBRACKET,')',1,13836)
 LexToken(ASSIGNMENT,'=',1,13837)
 LexToken(NUMBER,'2',1,13838)
-LexToken(OPERATOR,'*',1,13839)
+LexToken(MULTIPLICATION,'*',1,13839)
 LexToken(OPENBRACKET,'(',1,13840)
 LexToken(VAR,'x',1,13841)
 LexToken(OPENBRACKET,'(',1,13842)
 LexToken(VAR,'i',1,13843)
-LexToken(OPERATOR,'+',1,13844)
+LexToken(ADDITION,'+',1,13844)
 LexToken(NUMBER,'1',1,13845)
 LexToken(CLOSEBRACKET,')',1,13846)
-LexToken(OPERATOR,'-',1,13847)
+LexToken(ADDITION,'-',1,13847)
 LexToken(VAR,'x',1,13848)
 LexToken(OPENBRACKET,'(',1,13849)
 LexToken(VAR,'i',1,13850)
@@ -3392,11 +3417,11 @@ LexToken(EOL,'\n',1,13853)
 LexToken(VAR,'Q',1,13862)
 LexToken(OPENBRACKET,'(',1,13863)
 LexToken(VAR,'i',1,13864)
-LexToken(OPERATOR,'+',1,13865)
+LexToken(ADDITION,'+',1,13865)
 LexToken(VAR,'N',1,13866)
 LexToken(COMMA,',',1,13867)
 LexToken(VAR,'i',1,13868)
-LexToken(OPERATOR,'+',1,13869)
+LexToken(ADDITION,'+',1,13869)
 LexToken(VAR,'N',1,13870)
 LexToken(CLOSEBRACKET,')',1,13871)
 LexToken(ASSIGNMENT,'=',1,13872)
@@ -3419,14 +3444,16 @@ LexToken(COMMA,',',1,13899)
 LexToken(VAR,'zeros',1,13900)
 LexToken(OPENBRACKET,'(',1,13905)
 LexToken(NUMBER,'3',1,13906)
-LexToken(OPERATOR,'*',1,13907)
+LexToken(MULTIPLICATION,'*',1,13907)
 LexToken(VAR,'N',1,13908)
-LexToken(NUMBER,'-1',1,13909)
+LexToken(ADDITION,'-',1,13909)
+LexToken(NUMBER,'1',1,13910)
 LexToken(COMMA,',',1,13911)
 LexToken(NUMBER,'3',1,13912)
-LexToken(OPERATOR,'*',1,13913)
+LexToken(MULTIPLICATION,'*',1,13913)
 LexToken(VAR,'N',1,13914)
-LexToken(NUMBER,'-1',1,13915)
+LexToken(ADDITION,'-',1,13915)
+LexToken(NUMBER,'1',1,13916)
 LexToken(CLOSEBRACKET,')',1,13917)
 LexToken(CLOSESQBRACKET,']',1,13918)
 LexToken(EOL,'\n',1,13919)
@@ -3436,7 +3463,7 @@ LexToken(OPENSQBRACKET,'[',1,13927)
 LexToken(VAR,'zeros',1,13928)
 LexToken(OPENBRACKET,'(',1,13933)
 LexToken(NUMBER,'3',1,13934)
-LexToken(OPERATOR,'*',1,13935)
+LexToken(MULTIPLICATION,'*',1,13935)
 LexToken(VAR,'N',1,13936)
 LexToken(COMMA,',',1,13937)
 LexToken(NUMBER,'1',1,13938)
@@ -3448,7 +3475,7 @@ LexToken(EOL,'\n',1,13943)
 LexToken(VAR,'Zt',1,13948)
 LexToken(ASSIGNMENT,'=',1,13950)
 LexToken(VAR,'At',1,13951)
-LexToken(OPERATOR,'\\',1,13953)
+LexToken(MULTIPLICATION,'\\',1,13953)
 LexToken(VAR,'Bt',1,13954)
 LexToken(SEMICOLON,';',1,13956)
 LexToken(EOL,'\n',1,13957)
@@ -3459,7 +3486,7 @@ LexToken(OPENBRACKET,'(',1,13966)
 LexToken(NUMBER,'1',1,13967)
 LexToken(COLON,':',1,13968)
 LexToken(NUMBER,'3',1,13969)
-LexToken(OPERATOR,'*',1,13970)
+LexToken(MULTIPLICATION,'*',1,13970)
 LexToken(VAR,'N',1,13971)
 LexToken(COMMA,',',1,13972)
 LexToken(NUMBER,'1',1,13973)