add make rules for generating debug files

11 files changed, 397 insertions, 207 deletions

diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js
index a568bd5f..6e98b8ad 100644
--- a/js/IntegerOp/BITCLEAR.js
+++ b/js/IntegerOp/BITCLEAR.js
@@ -291,12 +291,14 @@ LexToken(VAR,'n',1,2264)
 LexToken(ASSIGNMENT,'=',1,2265)
 LexToken(OPENBRACKET,'(',1,2266)
 LexToken(NUMBER,'2',1,2267)
-LexToken(OPERATOR,'^',1,2268)
+LexToken(MULTIPLICATION,'^',1,2268)
 LexToken(NUMBER,'32',1,2269)
-LexToken(NUMBER,'-1',1,2271)
+LexToken(ADDITION,'-',1,2271)
+LexToken(NUMBER,'1',1,2272)
 LexToken(CLOSEBRACKET,')',1,2273)
-LexToken(NUMBER,'-2',1,2274)
-LexToken(OPERATOR,'^',1,2276)
+LexToken(ADDITION,'-',1,2274)
+LexToken(NUMBER,'2',1,2275)
+LexToken(MULTIPLICATION,'^',1,2276)
 LexToken(VAR,'bit',1,2277)
 LexToken(SEMICOLON,';',1,2280)
 LexToken(EOL,'\n',1,2281)
@@ -391,12 +393,14 @@ LexToken(VAR,'n',1,2807)
 LexToken(ASSIGNMENT,'=',1,2808)
 LexToken(OPENBRACKET,'(',1,2809)
 LexToken(NUMBER,'2',1,2810)
-LexToken(OPERATOR,'^',1,2811)
+LexToken(MULTIPLICATION,'^',1,2811)
 LexToken(NUMBER,'16',1,2812)
-LexToken(NUMBER,'-1',1,2814)
+LexToken(ADDITION,'-',1,2814)
+LexToken(NUMBER,'1',1,2815)
 LexToken(CLOSEBRACKET,')',1,2816)
-LexToken(NUMBER,'-2',1,2817)
-LexToken(OPERATOR,'^',1,2819)
+LexToken(ADDITION,'-',1,2817)
+LexToken(NUMBER,'2',1,2818)
+LexToken(MULTIPLICATION,'^',1,2819)
 LexToken(VAR,'bit',1,2820)
 LexToken(SEMICOLON,';',1,2823)
 LexToken(EOL,'\n',1,2824)
@@ -491,12 +495,14 @@ LexToken(VAR,'n',1,3347)
 LexToken(ASSIGNMENT,'=',1,3348)
 LexToken(OPENBRACKET,'(',1,3349)
 LexToken(NUMBER,'2',1,3350)
-LexToken(OPERATOR,'^',1,3351)
+LexToken(MULTIPLICATION,'^',1,3351)
 LexToken(NUMBER,'8',1,3352)
-LexToken(NUMBER,'-1',1,3353)
+LexToken(ADDITION,'-',1,3353)
+LexToken(NUMBER,'1',1,3354)
 LexToken(CLOSEBRACKET,')',1,3355)
-LexToken(NUMBER,'-2',1,3356)
-LexToken(OPERATOR,'^',1,3358)
+LexToken(ADDITION,'-',1,3356)
+LexToken(NUMBER,'2',1,3357)
+LexToken(MULTIPLICATION,'^',1,3358)
 LexToken(VAR,'bit',1,3359)
 LexToken(SEMICOLON,';',1,3362)
 LexToken(EOL,'\n',1,3363)
diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js
index 836e022a..27e2d9cb 100644
--- a/js/IntegerOp/BITSET.js
+++ b/js/IntegerOp/BITSET.js
@@ -290,7 +290,7 @@ LexToken(EOL,'\n',1,2133)
 LexToken(VAR,'n',1,2150)
 LexToken(ASSIGNMENT,'=',1,2151)
 LexToken(NUMBER,'2',1,2152)
-LexToken(OPERATOR,'^',1,2153)
+LexToken(MULTIPLICATION,'^',1,2153)
 LexToken(VAR,'bit',1,2154)
 LexToken(SEMICOLON,';',1,2157)
 LexToken(EOL,'\n',1,2158)
@@ -382,7 +382,7 @@ LexToken(EOL,'\n',1,2624)
 LexToken(VAR,'n',1,2641)
 LexToken(ASSIGNMENT,'=',1,2642)
 LexToken(NUMBER,'2',1,2643)
-LexToken(OPERATOR,'^',1,2644)
+LexToken(MULTIPLICATION,'^',1,2644)
 LexToken(VAR,'bit',1,2645)
 LexToken(SEMICOLON,';',1,2648)
 LexToken(EOL,'\n',1,2649)
@@ -475,7 +475,7 @@ LexToken(EOL,'\n',1,3113)
 LexToken(VAR,'n',1,3130)
 LexToken(ASSIGNMENT,'=',1,3131)
 LexToken(NUMBER,'2',1,3132)
-LexToken(OPERATOR,'^',1,3133)
+LexToken(MULTIPLICATION,'^',1,3133)
 LexToken(VAR,'bit',1,3134)
 LexToken(SEMICOLON,';',1,3137)
 LexToken(EOL,'\n',1,3138)
diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js
index c45e4086..346558c5 100644
--- a/js/IntegerOp/CONVERT.js
+++ b/js/IntegerOp/CONVERT.js
@@ -2627,25 +2627,29 @@ LexToken(VAR,'model',1,15657)
 LexToken(DOT,'.',1,15662)
 LexToken(VAR,'in',1,15663)
 LexToken(ASSIGNMENT,'=',1,15665)
-LexToken(NUMBER,'-1',1,15666)
+LexToken(ADDITION,'-',1,15666)
+LexToken(NUMBER,'1',1,15667)
 LexToken(EOL,'\n',1,15668)
 LexToken(VAR,'model',1,15677)
 LexToken(DOT,'.',1,15682)
 LexToken(VAR,'out',1,15683)
 LexToken(ASSIGNMENT,'=',1,15686)
-LexToken(NUMBER,'-1',1,15687)
+LexToken(ADDITION,'-',1,15687)
+LexToken(NUMBER,'1',1,15688)
 LexToken(EOL,'\n',1,15689)
 LexToken(VAR,'model',1,15698)
 LexToken(DOT,'.',1,15703)
 LexToken(VAR,'in2',1,15704)
 LexToken(ASSIGNMENT,'=',1,15707)
-LexToken(NUMBER,'-2',1,15708)
+LexToken(ADDITION,'-',1,15708)
+LexToken(NUMBER,'2',1,15709)
 LexToken(EOL,'\n',1,15710)
 LexToken(VAR,'model',1,15719)
 LexToken(DOT,'.',1,15724)
 LexToken(VAR,'out2',1,15725)
 LexToken(ASSIGNMENT,'=',1,15729)
-LexToken(NUMBER,'-2',1,15730)
+LexToken(ADDITION,'-',1,15730)
+LexToken(NUMBER,'2',1,15731)
 LexToken(EOL,'\n',1,15732)
 LexToken(VAR,'model',1,15741)
 LexToken(DOT,'.',1,15746)
diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js
index 04ba2016..6e2f16cc 100644
--- a/js/IntegerOp/DFLIPFLOP.js
+++ b/js/IntegerOp/DFLIPFLOP.js
@@ -523,7 +523,8 @@ LexToken(VAR,'list',1,2847)
 LexToken(OPENBRACKET,'(',1,2851)
 LexToken(DQSTRING,'"ifthel"',1,2859)
 LexToken(COMMA,',',1,2860)
-LexToken(NUMBER,'-1',1,2861)
+LexToken(ADDITION,'-',1,2861)
+LexToken(NUMBER,'1',1,2862)
 LexToken(CLOSEBRACKET,')',1,2863)
 LexToken(COMMA,',',1,2864)
 LexToken(VAR,'in',1,2876)
@@ -536,7 +537,8 @@ LexToken(NUMBER,'1',1,2896)
 LexToken(COMMA,',',1,2897)
 LexToken(VAR,'intyp',1,2909)
 LexToken(ASSIGNMENT,'=',1,2914)
-LexToken(NUMBER,'-1',1,2915)
+LexToken(ADDITION,'-',1,2915)
+LexToken(NUMBER,'1',1,2916)
 LexToken(COMMA,',',1,2917)
 LexToken(VAR,'out',1,2929)
 LexToken(ASSIGNMENT,'=',1,2932)
@@ -603,9 +605,11 @@ LexToken(COMMA,',',1,3170)
 LexToken(VAR,'firing',1,3182)
 LexToken(ASSIGNMENT,'=',1,3188)
 LexToken(OPENSQBRACKET,'[',1,3189)
-LexToken(NUMBER,'-1',1,3190)
+LexToken(ADDITION,'-',1,3190)
+LexToken(NUMBER,'1',1,3191)
 LexToken(COMMA,',',1,3192)
-LexToken(NUMBER,'-1',1,3193)
+LexToken(ADDITION,'-',1,3193)
+LexToken(NUMBER,'1',1,3194)
 LexToken(CLOSESQBRACKET,']',1,3195)
 LexToken(COMMA,',',1,3196)
 LexToken(VAR,'dep_ut',1,3208)
@@ -755,17 +759,21 @@ LexToken(COMMA,',',1,3812)
 LexToken(VAR,'in',1,3824)
 LexToken(ASSIGNMENT,'=',1,3826)
 LexToken(OPENSQBRACKET,'[',1,3827)
-LexToken(NUMBER,'-1',1,3828)
+LexToken(ADDITION,'-',1,3828)
+LexToken(NUMBER,'1',1,3829)
 LexToken(SEMICOLON,';',1,3830)
-LexToken(NUMBER,'-1',1,3831)
+LexToken(ADDITION,'-',1,3831)
+LexToken(NUMBER,'1',1,3832)
 LexToken(CLOSESQBRACKET,']',1,3833)
 LexToken(COMMA,',',1,3834)
 LexToken(VAR,'in2',1,3846)
 LexToken(ASSIGNMENT,'=',1,3849)
 LexToken(OPENSQBRACKET,'[',1,3850)
-LexToken(NUMBER,'-2',1,3851)
+LexToken(ADDITION,'-',1,3851)
+LexToken(NUMBER,'2',1,3852)
 LexToken(SEMICOLON,';',1,3853)
-LexToken(NUMBER,'-2',1,3854)
+LexToken(ADDITION,'-',1,3854)
+LexToken(NUMBER,'2',1,3855)
 LexToken(CLOSESQBRACKET,']',1,3856)
 LexToken(COMMA,',',1,3857)
 LexToken(VAR,'intyp',1,3869)
@@ -778,11 +786,13 @@ LexToken(CLOSESQBRACKET,']',1,3879)
 LexToken(COMMA,',',1,3880)
 LexToken(VAR,'out',1,3892)
 LexToken(ASSIGNMENT,'=',1,3895)
-LexToken(NUMBER,'-1',1,3896)
+LexToken(ADDITION,'-',1,3896)
+LexToken(NUMBER,'1',1,3897)
 LexToken(COMMA,',',1,3898)
 LexToken(VAR,'out2',1,3910)
 LexToken(ASSIGNMENT,'=',1,3914)
-LexToken(NUMBER,'-2',1,3915)
+LexToken(ADDITION,'-',1,3915)
+LexToken(NUMBER,'2',1,3916)
 LexToken(COMMA,',',1,3917)
 LexToken(VAR,'outtyp',1,3929)
 LexToken(ASSIGNMENT,'=',1,3935)
@@ -971,11 +981,13 @@ LexToken(CLOSEBRACKET,')',1,4744)
 LexToken(COMMA,',',1,4745)
 LexToken(VAR,'in',1,4757)
 LexToken(ASSIGNMENT,'=',1,4759)
-LexToken(NUMBER,'-1',1,4760)
+LexToken(ADDITION,'-',1,4760)
+LexToken(NUMBER,'1',1,4761)
 LexToken(COMMA,',',1,4762)
 LexToken(VAR,'in2',1,4774)
 LexToken(ASSIGNMENT,'=',1,4777)
-LexToken(NUMBER,'-2',1,4778)
+LexToken(ADDITION,'-',1,4778)
+LexToken(NUMBER,'2',1,4779)
 LexToken(COMMA,',',1,4780)
 LexToken(VAR,'intyp',1,4792)
 LexToken(ASSIGNMENT,'=',1,4797)
@@ -983,11 +995,13 @@ LexToken(NUMBER,'5',1,4798)
 LexToken(COMMA,',',1,4799)
 LexToken(VAR,'out',1,4811)
 LexToken(ASSIGNMENT,'=',1,4814)
-LexToken(NUMBER,'-1',1,4815)
+LexToken(ADDITION,'-',1,4815)
+LexToken(NUMBER,'1',1,4816)
 LexToken(COMMA,',',1,4817)
 LexToken(VAR,'out2',1,4829)
 LexToken(ASSIGNMENT,'=',1,4833)
-LexToken(NUMBER,'-2',1,4834)
+LexToken(ADDITION,'-',1,4834)
+LexToken(NUMBER,'2',1,4835)
 LexToken(COMMA,',',1,4836)
 LexToken(VAR,'outtyp',1,4848)
 LexToken(ASSIGNMENT,'=',1,4854)
@@ -1313,11 +1327,13 @@ LexToken(CLOSEBRACKET,')',1,6118)
 LexToken(COMMA,',',1,6119)
 LexToken(VAR,'in',1,6131)
 LexToken(ASSIGNMENT,'=',1,6133)
-LexToken(NUMBER,'-1',1,6134)
+LexToken(ADDITION,'-',1,6134)
+LexToken(NUMBER,'1',1,6135)
 LexToken(COMMA,',',1,6136)
 LexToken(VAR,'in2',1,6148)
 LexToken(ASSIGNMENT,'=',1,6151)
-LexToken(NUMBER,'-2',1,6152)
+LexToken(ADDITION,'-',1,6152)
+LexToken(NUMBER,'2',1,6153)
 LexToken(COMMA,',',1,6154)
 LexToken(VAR,'intyp',1,6166)
 LexToken(ASSIGNMENT,'=',1,6171)
@@ -1325,11 +1341,13 @@ LexToken(NUMBER,'5',1,6172)
 LexToken(COMMA,',',1,6173)
 LexToken(VAR,'out',1,6185)
 LexToken(ASSIGNMENT,'=',1,6188)
-LexToken(NUMBER,'-1',1,6189)
+LexToken(ADDITION,'-',1,6189)
+LexToken(NUMBER,'1',1,6190)
 LexToken(COMMA,',',1,6191)
 LexToken(VAR,'out2',1,6203)
 LexToken(ASSIGNMENT,'=',1,6207)
-LexToken(NUMBER,'-2',1,6208)
+LexToken(ADDITION,'-',1,6208)
+LexToken(NUMBER,'2',1,6209)
 LexToken(COMMA,',',1,6210)
 LexToken(VAR,'outtyp',1,6222)
 LexToken(ASSIGNMENT,'=',1,6228)
@@ -1530,7 +1548,8 @@ LexToken(NUMBER,'1',1,7069)
 LexToken(COMMA,',',1,7070)
 LexToken(VAR,'out',1,7082)
 LexToken(ASSIGNMENT,'=',1,7085)
-LexToken(NUMBER,'-1',1,7086)
+LexToken(ADDITION,'-',1,7086)
+LexToken(NUMBER,'1',1,7087)
 LexToken(COMMA,',',1,7088)
 LexToken(VAR,'out2',1,7100)
 LexToken(ASSIGNMENT,'=',1,7104)
@@ -1539,7 +1558,8 @@ LexToken(CLOSESQBRACKET,']',1,7106)
 LexToken(COMMA,',',1,7107)
 LexToken(VAR,'outtyp',1,7119)
 LexToken(ASSIGNMENT,'=',1,7125)
-LexToken(NUMBER,'-1',1,7126)
+LexToken(ADDITION,'-',1,7126)
+LexToken(NUMBER,'1',1,7127)
 LexToken(COMMA,',',1,7128)
 LexToken(VAR,'evtin',1,7140)
 LexToken(ASSIGNMENT,'=',1,7145)
@@ -1798,7 +1818,8 @@ LexToken(NUMBER,'1',1,8186)
 LexToken(COMMA,',',1,8187)
 LexToken(VAR,'out',1,8199)
 LexToken(ASSIGNMENT,'=',1,8202)
-LexToken(NUMBER,'-1',1,8203)
+LexToken(ADDITION,'-',1,8203)
+LexToken(NUMBER,'1',1,8204)
 LexToken(COMMA,',',1,8205)
 LexToken(VAR,'out2',1,8217)
 LexToken(ASSIGNMENT,'=',1,8221)
@@ -1807,7 +1828,8 @@ LexToken(CLOSESQBRACKET,']',1,8223)
 LexToken(COMMA,',',1,8224)
 LexToken(VAR,'outtyp',1,8236)
 LexToken(ASSIGNMENT,'=',1,8242)
-LexToken(NUMBER,'-1',1,8243)
+LexToken(ADDITION,'-',1,8243)
+LexToken(NUMBER,'1',1,8244)
 LexToken(COMMA,',',1,8245)
 LexToken(VAR,'evtin',1,8257)
 LexToken(ASSIGNMENT,'=',1,8262)
@@ -2052,7 +2074,8 @@ LexToken(DQSTRING,'"output"',1,9254)
 LexToken(COMMA,',',1,9255)
 LexToken(VAR,'in',1,9267)
 LexToken(ASSIGNMENT,'=',1,9269)
-LexToken(NUMBER,'-1',1,9270)
+LexToken(ADDITION,'-',1,9270)
+LexToken(NUMBER,'1',1,9271)
 LexToken(COMMA,',',1,9272)
 LexToken(VAR,'in2',1,9284)
 LexToken(ASSIGNMENT,'=',1,9287)
@@ -2061,7 +2084,8 @@ LexToken(CLOSESQBRACKET,']',1,9289)
 LexToken(COMMA,',',1,9290)
 LexToken(VAR,'intyp',1,9302)
 LexToken(ASSIGNMENT,'=',1,9307)
-LexToken(NUMBER,'-1',1,9308)
+LexToken(ADDITION,'-',1,9308)
+LexToken(NUMBER,'1',1,9309)
 LexToken(COMMA,',',1,9310)
 LexToken(VAR,'out',1,9322)
 LexToken(ASSIGNMENT,'=',1,9325)
@@ -2320,7 +2344,8 @@ LexToken(DQSTRING,'"output"',1,10375)
 LexToken(COMMA,',',1,10376)
 LexToken(VAR,'in',1,10388)
 LexToken(ASSIGNMENT,'=',1,10390)
-LexToken(NUMBER,'-1',1,10391)
+LexToken(ADDITION,'-',1,10391)
+LexToken(NUMBER,'1',1,10392)
 LexToken(COMMA,',',1,10393)
 LexToken(VAR,'in2',1,10405)
 LexToken(ASSIGNMENT,'=',1,10408)
@@ -2329,7 +2354,8 @@ LexToken(CLOSESQBRACKET,']',1,10410)
 LexToken(COMMA,',',1,10411)
 LexToken(VAR,'intyp',1,10423)
 LexToken(ASSIGNMENT,'=',1,10428)
-LexToken(NUMBER,'-1',1,10429)
+LexToken(ADDITION,'-',1,10429)
+LexToken(NUMBER,'1',1,10430)
 LexToken(COMMA,',',1,10431)
 LexToken(VAR,'out',1,10443)
 LexToken(ASSIGNMENT,'=',1,10446)
@@ -2946,7 +2972,8 @@ LexToken(DQSTRING,'"d"',1,12941)
 LexToken(COMMA,',',1,12942)
 LexToken(VAR,'firing',1,12954)
 LexToken(ASSIGNMENT,'=',1,12960)
-LexToken(NUMBER,'-1',1,12961)
+LexToken(ADDITION,'-',1,12961)
+LexToken(NUMBER,'1',1,12962)
 LexToken(COMMA,',',1,12963)
 LexToken(VAR,'dep_ut',1,12975)
 LexToken(ASSIGNMENT,'=',1,12981)
@@ -3231,7 +3258,8 @@ LexToken(ASSIGNMENT,'=',1,14144)
 LexToken(OPENSQBRACKET,'[',1,14145)
 LexToken(NUMBER,'5',1,14146)
 LexToken(COMMA,',',1,14147)
-LexToken(NUMBER,'-1',1,14148)
+LexToken(ADDITION,'-',1,14148)
+LexToken(NUMBER,'1',1,14149)
 LexToken(CLOSESQBRACKET,']',1,14150)
 LexToken(COMMA,',',1,14151)
 LexToken(VAR,'from',1,14163)
@@ -3417,7 +3445,8 @@ LexToken(DQSTRING,'"d"',1,14919)
 LexToken(COMMA,',',1,14920)
 LexToken(VAR,'firing',1,14932)
 LexToken(ASSIGNMENT,'=',1,14938)
-LexToken(NUMBER,'-1',1,14939)
+LexToken(ADDITION,'-',1,14939)
+LexToken(NUMBER,'1',1,14940)
 LexToken(COMMA,',',1,14941)
 LexToken(VAR,'dep_ut',1,14953)
 LexToken(ASSIGNMENT,'=',1,14959)
@@ -3499,7 +3528,8 @@ LexToken(ASSIGNMENT,'=',1,15236)
 LexToken(OPENSQBRACKET,'[',1,15237)
 LexToken(NUMBER,'5',1,15238)
 LexToken(COMMA,',',1,15239)
-LexToken(NUMBER,'-1',1,15240)
+LexToken(ADDITION,'-',1,15240)
+LexToken(NUMBER,'1',1,15241)
 LexToken(CLOSESQBRACKET,']',1,15242)
 LexToken(COMMA,',',1,15243)
 LexToken(VAR,'from',1,15255)
@@ -3618,7 +3648,8 @@ LexToken(VAR,'list',1,15714)
 LexToken(OPENBRACKET,'(',1,15718)
 LexToken(DQSTRING,'"ifthel"',1,15726)
 LexToken(COMMA,',',1,15727)
-LexToken(NUMBER,'-1',1,15728)
+LexToken(ADDITION,'-',1,15728)
+LexToken(NUMBER,'1',1,15729)
 LexToken(CLOSEBRACKET,')',1,15730)
 LexToken(COMMA,',',1,15731)
 LexToken(VAR,'in',1,15743)
@@ -3631,7 +3662,8 @@ LexToken(NUMBER,'1',1,15763)
 LexToken(COMMA,',',1,15764)
 LexToken(VAR,'intyp',1,15776)
 LexToken(ASSIGNMENT,'=',1,15781)
-LexToken(NUMBER,'-1',1,15782)
+LexToken(ADDITION,'-',1,15782)
+LexToken(NUMBER,'1',1,15783)
 LexToken(COMMA,',',1,15784)
 LexToken(VAR,'out',1,15796)
 LexToken(ASSIGNMENT,'=',1,15799)
@@ -3698,9 +3730,11 @@ LexToken(COMMA,',',1,16037)
 LexToken(VAR,'firing',1,16049)
 LexToken(ASSIGNMENT,'=',1,16055)
 LexToken(OPENSQBRACKET,'[',1,16056)
-LexToken(NUMBER,'-1',1,16057)
+LexToken(ADDITION,'-',1,16057)
+LexToken(NUMBER,'1',1,16058)
 LexToken(COMMA,',',1,16059)
-LexToken(NUMBER,'-1',1,16060)
+LexToken(ADDITION,'-',1,16060)
+LexToken(NUMBER,'1',1,16061)
 LexToken(CLOSESQBRACKET,']',1,16062)
 LexToken(COMMA,',',1,16063)
 LexToken(VAR,'dep_ut',1,16075)
@@ -3783,7 +3817,8 @@ LexToken(ASSIGNMENT,'=',1,16356)
 LexToken(OPENSQBRACKET,'[',1,16357)
 LexToken(NUMBER,'5',1,16358)
 LexToken(COMMA,',',1,16359)
-LexToken(NUMBER,'-1',1,16360)
+LexToken(ADDITION,'-',1,16360)
+LexToken(NUMBER,'1',1,16361)
 LexToken(CLOSESQBRACKET,']',1,16362)
 LexToken(COMMA,',',1,16363)
 LexToken(VAR,'from',1,16375)
@@ -4123,7 +4158,8 @@ LexToken(ASSIGNMENT,'=',1,17685)
 LexToken(OPENSQBRACKET,'[',1,17686)
 LexToken(NUMBER,'5',1,17687)
 LexToken(COMMA,',',1,17688)
-LexToken(NUMBER,'-1',1,17689)
+LexToken(ADDITION,'-',1,17689)
+LexToken(NUMBER,'1',1,17690)
 LexToken(CLOSESQBRACKET,']',1,17691)
 LexToken(COMMA,',',1,17692)
 LexToken(VAR,'from',1,17704)
@@ -4189,7 +4225,8 @@ LexToken(ASSIGNMENT,'=',1,17900)
 LexToken(OPENSQBRACKET,'[',1,17901)
 LexToken(NUMBER,'5',1,17902)
 LexToken(COMMA,',',1,17903)
-LexToken(NUMBER,'-1',1,17904)
+LexToken(ADDITION,'-',1,17904)
+LexToken(NUMBER,'1',1,17905)
 LexToken(CLOSESQBRACKET,']',1,17906)
 LexToken(COMMA,',',1,17907)
 LexToken(VAR,'from',1,17919)
@@ -4460,7 +4497,8 @@ LexToken(ASSIGNMENT,'=',1,19030)
 LexToken(OPENSQBRACKET,'[',1,19031)
 LexToken(NUMBER,'5',1,19032)
 LexToken(COMMA,',',1,19033)
-LexToken(NUMBER,'-1',1,19034)
+LexToken(ADDITION,'-',1,19034)
+LexToken(NUMBER,'1',1,19035)
 LexToken(CLOSESQBRACKET,']',1,19036)
 LexToken(COMMA,',',1,19037)
 LexToken(VAR,'from',1,19049)
@@ -4526,7 +4564,8 @@ LexToken(ASSIGNMENT,'=',1,19254)
 LexToken(OPENSQBRACKET,'[',1,19255)
 LexToken(NUMBER,'5',1,19256)
 LexToken(COMMA,',',1,19257)
-LexToken(NUMBER,'-1',1,19258)
+LexToken(ADDITION,'-',1,19258)
+LexToken(NUMBER,'1',1,19259)
 LexToken(CLOSESQBRACKET,']',1,19260)
 LexToken(COMMA,',',1,19261)
 LexToken(VAR,'from',1,19273)
@@ -4999,7 +5038,8 @@ LexToken(VAR,'list',1,21149)
 LexToken(OPENBRACKET,'(',1,21153)
 LexToken(DQSTRING,'"ifthel"',1,21161)
 LexToken(COMMA,',',1,21162)
-LexToken(NUMBER,'-1',1,21163)
+LexToken(ADDITION,'-',1,21163)
+LexToken(NUMBER,'1',1,21164)
 LexToken(CLOSEBRACKET,')',1,21165)
 LexToken(COMMA,',',1,21166)
 LexToken(VAR,'in',1,21178)
@@ -5081,9 +5121,11 @@ LexToken(COMMA,',',1,21473)
 LexToken(VAR,'firing',1,21485)
 LexToken(ASSIGNMENT,'=',1,21491)
 LexToken(OPENSQBRACKET,'[',1,21492)
-LexToken(NUMBER,'-1',1,21493)
+LexToken(ADDITION,'-',1,21493)
+LexToken(NUMBER,'1',1,21494)
 LexToken(COMMA,',',1,21495)
-LexToken(NUMBER,'-1',1,21496)
+LexToken(ADDITION,'-',1,21496)
+LexToken(NUMBER,'1',1,21497)
 LexToken(CLOSESQBRACKET,']',1,21498)
 LexToken(COMMA,',',1,21499)
 LexToken(VAR,'dep_ut',1,21511)
@@ -5293,11 +5335,13 @@ LexToken(CLOSESQBRACKET,']',1,22343)
 LexToken(COMMA,',',1,22344)
 LexToken(VAR,'intyp',1,22356)
 LexToken(ASSIGNMENT,'=',1,22361)
-LexToken(NUMBER,'-1',1,22362)
+LexToken(ADDITION,'-',1,22362)
+LexToken(NUMBER,'1',1,22363)
 LexToken(COMMA,',',1,22364)
 LexToken(VAR,'out',1,22376)
 LexToken(ASSIGNMENT,'=',1,22379)
-LexToken(NUMBER,'-1',1,22380)
+LexToken(ADDITION,'-',1,22380)
+LexToken(NUMBER,'1',1,22381)
 LexToken(COMMA,',',1,22382)
 LexToken(VAR,'out2',1,22394)
 LexToken(ASSIGNMENT,'=',1,22398)
@@ -5703,7 +5747,8 @@ LexToken(ASSIGNMENT,'=',1,24064)
 LexToken(OPENSQBRACKET,'[',1,24065)
 LexToken(NUMBER,'5',1,24066)
 LexToken(COMMA,',',1,24067)
-LexToken(NUMBER,'-1',1,24068)
+LexToken(ADDITION,'-',1,24068)
+LexToken(NUMBER,'1',1,24069)
 LexToken(CLOSESQBRACKET,']',1,24070)
 LexToken(COMMA,',',1,24071)
 LexToken(VAR,'from',1,24083)
@@ -5820,7 +5865,8 @@ LexToken(DQSTRING,'"csuper"',1,24556)
 LexToken(COMMA,',',1,24557)
 LexToken(VAR,'in',1,24569)
 LexToken(ASSIGNMENT,'=',1,24571)
-LexToken(NUMBER,'-1',1,24572)
+LexToken(ADDITION,'-',1,24572)
+LexToken(NUMBER,'1',1,24573)
 LexToken(COMMA,',',1,24574)
 LexToken(VAR,'in2',1,24586)
 LexToken(ASSIGNMENT,'=',1,24589)
@@ -5974,7 +6020,8 @@ LexToken(ASSIGNMENT,'=',1,25214)
 LexToken(OPENSQBRACKET,'[',1,25215)
 LexToken(NUMBER,'5',1,25216)
 LexToken(COMMA,',',1,25217)
-LexToken(NUMBER,'-1',1,25218)
+LexToken(ADDITION,'-',1,25218)
+LexToken(NUMBER,'1',1,25219)
 LexToken(CLOSESQBRACKET,']',1,25220)
 LexToken(COMMA,',',1,25221)
 LexToken(VAR,'from',1,25233)
@@ -6105,7 +6152,8 @@ LexToken(NUMBER,'1',1,25756)
 LexToken(COMMA,',',1,25757)
 LexToken(VAR,'out',1,25769)
 LexToken(ASSIGNMENT,'=',1,25772)
-LexToken(NUMBER,'-1',1,25773)
+LexToken(ADDITION,'-',1,25773)
+LexToken(NUMBER,'1',1,25774)
 LexToken(COMMA,',',1,25775)
 LexToken(VAR,'out2',1,25787)
 LexToken(ASSIGNMENT,'=',1,25791)
@@ -6114,7 +6162,8 @@ LexToken(CLOSESQBRACKET,']',1,25793)
 LexToken(COMMA,',',1,25794)
 LexToken(VAR,'outtyp',1,25806)
 LexToken(ASSIGNMENT,'=',1,25812)
-LexToken(NUMBER,'-1',1,25813)
+LexToken(ADDITION,'-',1,25813)
+LexToken(NUMBER,'1',1,25814)
 LexToken(COMMA,',',1,25815)
 LexToken(VAR,'evtin',1,25827)
 LexToken(ASSIGNMENT,'=',1,25832)
@@ -6446,7 +6495,8 @@ LexToken(VAR,'list',1,27103)
 LexToken(OPENBRACKET,'(',1,27107)
 LexToken(DQSTRING,'"ifthel"',1,27115)
 LexToken(COMMA,',',1,27116)
-LexToken(NUMBER,'-1',1,27117)
+LexToken(ADDITION,'-',1,27117)
+LexToken(NUMBER,'1',1,27118)
 LexToken(CLOSEBRACKET,')',1,27119)
 LexToken(COMMA,',',1,27120)
 LexToken(VAR,'in',1,27132)
@@ -6528,9 +6578,11 @@ LexToken(COMMA,',',1,27427)
 LexToken(VAR,'firing',1,27439)
 LexToken(ASSIGNMENT,'=',1,27445)
 LexToken(OPENSQBRACKET,'[',1,27446)
-LexToken(NUMBER,'-1',1,27447)
+LexToken(ADDITION,'-',1,27447)
+LexToken(NUMBER,'1',1,27448)
 LexToken(COMMA,',',1,27449)
-LexToken(NUMBER,'-1',1,27450)
+LexToken(ADDITION,'-',1,27450)
+LexToken(NUMBER,'1',1,27451)
 LexToken(CLOSESQBRACKET,']',1,27452)
 LexToken(COMMA,',',1,27453)
 LexToken(VAR,'dep_ut',1,27465)
@@ -6745,7 +6797,8 @@ LexToken(DQSTRING,'"d"',1,28352)
 LexToken(COMMA,',',1,28353)
 LexToken(VAR,'firing',1,28365)
 LexToken(ASSIGNMENT,'=',1,28371)
-LexToken(NUMBER,'-1',1,28372)
+LexToken(ADDITION,'-',1,28372)
+LexToken(NUMBER,'1',1,28373)
 LexToken(COMMA,',',1,28374)
 LexToken(VAR,'dep_ut',1,28386)
 LexToken(ASSIGNMENT,'=',1,28392)
@@ -6835,7 +6888,8 @@ LexToken(ASSIGNMENT,'=',1,28738)
 LexToken(OPENSQBRACKET,'[',1,28739)
 LexToken(NUMBER,'5',1,28740)
 LexToken(COMMA,',',1,28741)
-LexToken(NUMBER,'-1',1,28742)
+LexToken(ADDITION,'-',1,28742)
+LexToken(NUMBER,'1',1,28743)
 LexToken(CLOSESQBRACKET,']',1,28744)
 LexToken(COMMA,',',1,28745)
 LexToken(VAR,'from',1,28757)
@@ -6905,7 +6959,8 @@ LexToken(ASSIGNMENT,'=',1,28981)
 LexToken(OPENSQBRACKET,'[',1,28982)
 LexToken(NUMBER,'5',1,28983)
 LexToken(COMMA,',',1,28984)
-LexToken(NUMBER,'-1',1,28985)
+LexToken(ADDITION,'-',1,28985)
+LexToken(NUMBER,'1',1,28986)
 LexToken(CLOSESQBRACKET,']',1,28987)
 LexToken(COMMA,',',1,28988)
 LexToken(VAR,'from',1,29000)
@@ -7032,11 +7087,13 @@ LexToken(CLOSESQBRACKET,']',1,29502)
 LexToken(COMMA,',',1,29503)
 LexToken(VAR,'intyp',1,29515)
 LexToken(ASSIGNMENT,'=',1,29520)
-LexToken(NUMBER,'-1',1,29521)
+LexToken(ADDITION,'-',1,29521)
+LexToken(NUMBER,'1',1,29522)
 LexToken(COMMA,',',1,29523)
 LexToken(VAR,'out',1,29535)
 LexToken(ASSIGNMENT,'=',1,29538)
-LexToken(NUMBER,'-1',1,29539)
+LexToken(ADDITION,'-',1,29539)
+LexToken(NUMBER,'1',1,29540)
 LexToken(COMMA,',',1,29541)
 LexToken(VAR,'out2',1,29553)
 LexToken(ASSIGNMENT,'=',1,29557)
@@ -7442,7 +7499,8 @@ LexToken(ASSIGNMENT,'=',1,31225)
 LexToken(OPENSQBRACKET,'[',1,31226)
 LexToken(NUMBER,'5',1,31227)
 LexToken(COMMA,',',1,31228)
-LexToken(NUMBER,'-1',1,31229)
+LexToken(ADDITION,'-',1,31229)
+LexToken(NUMBER,'1',1,31230)
 LexToken(CLOSESQBRACKET,']',1,31231)
 LexToken(COMMA,',',1,31232)
 LexToken(VAR,'from',1,31244)
@@ -7559,7 +7617,8 @@ LexToken(DQSTRING,'"csuper"',1,31725)
 LexToken(COMMA,',',1,31726)
 LexToken(VAR,'in',1,31738)
 LexToken(ASSIGNMENT,'=',1,31740)
-LexToken(NUMBER,'-1',1,31741)
+LexToken(ADDITION,'-',1,31741)
+LexToken(NUMBER,'1',1,31742)
 LexToken(COMMA,',',1,31743)
 LexToken(VAR,'in2',1,31755)
 LexToken(ASSIGNMENT,'=',1,31758)
@@ -7709,7 +7768,8 @@ LexToken(ASSIGNMENT,'=',1,32363)
 LexToken(OPENSQBRACKET,'[',1,32364)
 LexToken(NUMBER,'5',1,32365)
 LexToken(COMMA,',',1,32366)
-LexToken(NUMBER,'-1',1,32367)
+LexToken(ADDITION,'-',1,32367)
+LexToken(NUMBER,'1',1,32368)
 LexToken(CLOSESQBRACKET,']',1,32369)
 LexToken(COMMA,',',1,32370)
 LexToken(VAR,'from',1,32382)
@@ -7909,11 +7969,14 @@ LexToken(COMMA,',',1,33116)
 LexToken(VAR,'in',1,33128)
 LexToken(ASSIGNMENT,'=',1,33130)
 LexToken(OPENSQBRACKET,'[',1,33131)
-LexToken(NUMBER,'-1',1,33132)
+LexToken(ADDITION,'-',1,33132)
+LexToken(NUMBER,'1',1,33133)
 LexToken(SEMICOLON,';',1,33134)
-LexToken(NUMBER,'-1',1,33135)
+LexToken(ADDITION,'-',1,33135)
+LexToken(NUMBER,'1',1,33136)
 LexToken(SEMICOLON,';',1,33137)
-LexToken(NUMBER,'-1',1,33138)
+LexToken(ADDITION,'-',1,33138)
+LexToken(NUMBER,'1',1,33139)
 LexToken(CLOSESQBRACKET,']',1,33140)
 LexToken(COMMA,',',1,33141)
 LexToken(VAR,'in2',1,33153)
@@ -7927,7 +7990,8 @@ LexToken(NUMBER,'1',1,33177)
 LexToken(COMMA,',',1,33178)
 LexToken(VAR,'out',1,33190)
 LexToken(ASSIGNMENT,'=',1,33193)
-LexToken(NUMBER,'-1',1,33194)
+LexToken(ADDITION,'-',1,33194)
+LexToken(NUMBER,'1',1,33195)
 LexToken(COMMA,',',1,33196)
 LexToken(VAR,'out2',1,33208)
 LexToken(ASSIGNMENT,'=',1,33212)
@@ -8125,7 +8189,8 @@ LexToken(DQSTRING,'"lsplit"',1,34053)
 LexToken(COMMA,',',1,34054)
 LexToken(VAR,'in',1,34066)
 LexToken(ASSIGNMENT,'=',1,34068)
-LexToken(NUMBER,'-1',1,34069)
+LexToken(ADDITION,'-',1,34069)
+LexToken(NUMBER,'1',1,34070)
 LexToken(COMMA,',',1,34071)
 LexToken(VAR,'in2',1,34083)
 LexToken(ASSIGNMENT,'=',1,34086)
@@ -8139,11 +8204,14 @@ LexToken(COMMA,',',1,34108)
 LexToken(VAR,'out',1,34120)
 LexToken(ASSIGNMENT,'=',1,34123)
 LexToken(OPENSQBRACKET,'[',1,34124)
-LexToken(NUMBER,'-1',1,34125)
+LexToken(ADDITION,'-',1,34125)
+LexToken(NUMBER,'1',1,34126)
 LexToken(SEMICOLON,';',1,34127)
-LexToken(NUMBER,'-1',1,34128)
+LexToken(ADDITION,'-',1,34128)
+LexToken(NUMBER,'1',1,34129)
 LexToken(SEMICOLON,';',1,34130)
-LexToken(NUMBER,'-1',1,34131)
+LexToken(ADDITION,'-',1,34131)
+LexToken(NUMBER,'1',1,34132)
 LexToken(CLOSESQBRACKET,']',1,34133)
 LexToken(COMMA,',',1,34134)
 LexToken(VAR,'out2',1,34146)
@@ -8482,7 +8550,8 @@ LexToken(DQSTRING,'"lsplit"',1,35475)
 LexToken(COMMA,',',1,35476)
 LexToken(VAR,'in',1,35488)
 LexToken(ASSIGNMENT,'=',1,35490)
-LexToken(NUMBER,'-1',1,35491)
+LexToken(ADDITION,'-',1,35491)
+LexToken(NUMBER,'1',1,35492)
 LexToken(COMMA,',',1,35493)
 LexToken(VAR,'in2',1,35505)
 LexToken(ASSIGNMENT,'=',1,35508)
@@ -8496,11 +8565,14 @@ LexToken(COMMA,',',1,35530)
 LexToken(VAR,'out',1,35542)
 LexToken(ASSIGNMENT,'=',1,35545)
 LexToken(OPENSQBRACKET,'[',1,35546)
-LexToken(NUMBER,'-1',1,35547)
+LexToken(ADDITION,'-',1,35547)
+LexToken(NUMBER,'1',1,35548)
 LexToken(SEMICOLON,';',1,35549)
-LexToken(NUMBER,'-1',1,35550)
+LexToken(ADDITION,'-',1,35550)
+LexToken(NUMBER,'1',1,35551)
 LexToken(SEMICOLON,';',1,35552)
-LexToken(NUMBER,'-1',1,35553)
+LexToken(ADDITION,'-',1,35553)
+LexToken(NUMBER,'1',1,35554)
 LexToken(CLOSESQBRACKET,']',1,35555)
 LexToken(COMMA,',',1,35556)
 LexToken(VAR,'out2',1,35568)
@@ -8917,17 +8989,21 @@ LexToken(COMMA,',',1,37128)
 LexToken(VAR,'in',1,37140)
 LexToken(ASSIGNMENT,'=',1,37142)
 LexToken(OPENSQBRACKET,'[',1,37143)
-LexToken(NUMBER,'-1',1,37144)
+LexToken(ADDITION,'-',1,37144)
+LexToken(NUMBER,'1',1,37145)
 LexToken(SEMICOLON,';',1,37146)
-LexToken(NUMBER,'-1',1,37147)
+LexToken(ADDITION,'-',1,37147)
+LexToken(NUMBER,'1',1,37148)
 LexToken(CLOSESQBRACKET,']',1,37149)
 LexToken(COMMA,',',1,37150)
 LexToken(VAR,'in2',1,37162)
 LexToken(ASSIGNMENT,'=',1,37165)
 LexToken(OPENSQBRACKET,'[',1,37166)
-LexToken(NUMBER,'-2',1,37167)
+LexToken(ADDITION,'-',1,37167)
+LexToken(NUMBER,'2',1,37168)
 LexToken(SEMICOLON,';',1,37169)
-LexToken(NUMBER,'-2',1,37170)
+LexToken(ADDITION,'-',1,37170)
+LexToken(NUMBER,'2',1,37171)
 LexToken(CLOSESQBRACKET,']',1,37172)
 LexToken(COMMA,',',1,37173)
 LexToken(VAR,'intyp',1,37185)
@@ -8940,11 +9016,13 @@ LexToken(CLOSESQBRACKET,']',1,37195)
 LexToken(COMMA,',',1,37196)
 LexToken(VAR,'out',1,37208)
 LexToken(ASSIGNMENT,'=',1,37211)
-LexToken(NUMBER,'-1',1,37212)
+LexToken(ADDITION,'-',1,37212)
+LexToken(NUMBER,'1',1,37213)
 LexToken(COMMA,',',1,37214)
 LexToken(VAR,'out2',1,37226)
 LexToken(ASSIGNMENT,'=',1,37230)
-LexToken(NUMBER,'-2',1,37231)
+LexToken(ADDITION,'-',1,37231)
+LexToken(NUMBER,'2',1,37232)
 LexToken(COMMA,',',1,37233)
 LexToken(VAR,'outtyp',1,37245)
 LexToken(ASSIGNMENT,'=',1,37251)
@@ -9275,7 +9353,8 @@ LexToken(DQSTRING,'"lsplit"',1,38540)
 LexToken(COMMA,',',1,38541)
 LexToken(VAR,'in',1,38553)
 LexToken(ASSIGNMENT,'=',1,38555)
-LexToken(NUMBER,'-1',1,38556)
+LexToken(ADDITION,'-',1,38556)
+LexToken(NUMBER,'1',1,38557)
 LexToken(COMMA,',',1,38558)
 LexToken(VAR,'in2',1,38570)
 LexToken(ASSIGNMENT,'=',1,38573)
@@ -9289,11 +9368,14 @@ LexToken(COMMA,',',1,38595)
 LexToken(VAR,'out',1,38607)
 LexToken(ASSIGNMENT,'=',1,38610)
 LexToken(OPENSQBRACKET,'[',1,38611)
-LexToken(NUMBER,'-1',1,38612)
+LexToken(ADDITION,'-',1,38612)
+LexToken(NUMBER,'1',1,38613)
 LexToken(SEMICOLON,';',1,38614)
-LexToken(NUMBER,'-1',1,38615)
+LexToken(ADDITION,'-',1,38615)
+LexToken(NUMBER,'1',1,38616)
 LexToken(SEMICOLON,';',1,38617)
-LexToken(NUMBER,'-1',1,38618)
+LexToken(ADDITION,'-',1,38618)
+LexToken(NUMBER,'1',1,38619)
 LexToken(CLOSESQBRACKET,']',1,38620)
 LexToken(COMMA,',',1,38621)
 LexToken(VAR,'out2',1,38633)
@@ -9628,7 +9710,8 @@ LexToken(DQSTRING,'"lsplit"',1,39943)
 LexToken(COMMA,',',1,39944)
 LexToken(VAR,'in',1,39956)
 LexToken(ASSIGNMENT,'=',1,39958)
-LexToken(NUMBER,'-1',1,39959)
+LexToken(ADDITION,'-',1,39959)
+LexToken(NUMBER,'1',1,39960)
 LexToken(COMMA,',',1,39961)
 LexToken(VAR,'in2',1,39973)
 LexToken(ASSIGNMENT,'=',1,39976)
@@ -9642,11 +9725,14 @@ LexToken(COMMA,',',1,39998)
 LexToken(VAR,'out',1,40010)
 LexToken(ASSIGNMENT,'=',1,40013)
 LexToken(OPENSQBRACKET,'[',1,40014)
-LexToken(NUMBER,'-1',1,40015)
+LexToken(ADDITION,'-',1,40015)
+LexToken(NUMBER,'1',1,40016)
 LexToken(SEMICOLON,';',1,40017)
-LexToken(NUMBER,'-1',1,40018)
+LexToken(ADDITION,'-',1,40018)
+LexToken(NUMBER,'1',1,40019)
 LexToken(SEMICOLON,';',1,40020)
-LexToken(NUMBER,'-1',1,40021)
+LexToken(ADDITION,'-',1,40021)
+LexToken(NUMBER,'1',1,40022)
 LexToken(CLOSESQBRACKET,']',1,40023)
 LexToken(COMMA,',',1,40024)
 LexToken(VAR,'out2',1,40036)
@@ -10141,7 +10227,8 @@ LexToken(ASSIGNMENT,'=',1,42002)
 LexToken(OPENSQBRACKET,'[',1,42003)
 LexToken(NUMBER,'5',1,42004)
 LexToken(COMMA,',',1,42005)
-LexToken(NUMBER,'-1',1,42006)
+LexToken(ADDITION,'-',1,42006)
+LexToken(NUMBER,'1',1,42007)
 LexToken(CLOSESQBRACKET,']',1,42008)
 LexToken(COMMA,',',1,42009)
 LexToken(VAR,'from',1,42021)
@@ -10211,7 +10298,8 @@ LexToken(ASSIGNMENT,'=',1,42246)
 LexToken(OPENSQBRACKET,'[',1,42247)
 LexToken(NUMBER,'5',1,42248)
 LexToken(COMMA,',',1,42249)
-LexToken(NUMBER,'-1',1,42250)
+LexToken(ADDITION,'-',1,42250)
+LexToken(NUMBER,'1',1,42251)
 LexToken(CLOSESQBRACKET,']',1,42252)
 LexToken(COMMA,',',1,42253)
 LexToken(VAR,'from',1,42265)
@@ -10285,7 +10373,8 @@ LexToken(ASSIGNMENT,'=',1,42511)
 LexToken(OPENSQBRACKET,'[',1,42512)
 LexToken(NUMBER,'5',1,42513)
 LexToken(COMMA,',',1,42514)
-LexToken(NUMBER,'-1',1,42515)
+LexToken(ADDITION,'-',1,42515)
+LexToken(NUMBER,'1',1,42516)
 LexToken(CLOSESQBRACKET,']',1,42517)
 LexToken(COMMA,',',1,42518)
 LexToken(VAR,'from',1,42530)
diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js
index 430d69e4..857b829f 100644
--- a/js/IntegerOp/DLATCH.js
+++ b/js/IntegerOp/DLATCH.js
@@ -528,7 +528,8 @@ LexToken(VAR,'list',1,2932)
 LexToken(OPENBRACKET,'(',1,2936)
 LexToken(DQSTRING,'"ifthel"',1,2944)
 LexToken(COMMA,',',1,2945)
-LexToken(NUMBER,'-1',1,2946)
+LexToken(ADDITION,'-',1,2946)
+LexToken(NUMBER,'1',1,2947)
 LexToken(CLOSEBRACKET,')',1,2948)
 LexToken(COMMA,',',1,2949)
 LexToken(VAR,'in',1,2961)
@@ -541,7 +542,8 @@ LexToken(NUMBER,'1',1,2981)
 LexToken(COMMA,',',1,2982)
 LexToken(VAR,'intyp',1,2994)
 LexToken(ASSIGNMENT,'=',1,2999)
-LexToken(NUMBER,'-1',1,3000)
+LexToken(ADDITION,'-',1,3000)
+LexToken(NUMBER,'1',1,3001)
 LexToken(COMMA,',',1,3002)
 LexToken(VAR,'out',1,3014)
 LexToken(ASSIGNMENT,'=',1,3017)
@@ -609,9 +611,11 @@ LexToken(COMMA,',',1,3256)
 LexToken(VAR,'firing',1,3268)
 LexToken(ASSIGNMENT,'=',1,3274)
 LexToken(OPENSQBRACKET,'[',1,3275)
-LexToken(NUMBER,'-1',1,3276)
+LexToken(ADDITION,'-',1,3276)
+LexToken(NUMBER,'1',1,3277)
 LexToken(COMMA,',',1,3278)
-LexToken(NUMBER,'-1',1,3279)
+LexToken(ADDITION,'-',1,3279)
+LexToken(NUMBER,'1',1,3280)
 LexToken(CLOSESQBRACKET,']',1,3281)
 LexToken(COMMA,',',1,3282)
 LexToken(VAR,'dep_ut',1,3294)
@@ -765,17 +769,21 @@ LexToken(COMMA,',',1,3986)
 LexToken(VAR,'in',1,3998)
 LexToken(ASSIGNMENT,'=',1,4000)
 LexToken(OPENSQBRACKET,'[',1,4001)
-LexToken(NUMBER,'-1',1,4002)
+LexToken(ADDITION,'-',1,4002)
+LexToken(NUMBER,'1',1,4003)
 LexToken(SEMICOLON,';',1,4004)
-LexToken(NUMBER,'-1',1,4005)
+LexToken(ADDITION,'-',1,4005)
+LexToken(NUMBER,'1',1,4006)
 LexToken(CLOSESQBRACKET,']',1,4007)
 LexToken(COMMA,',',1,4008)
 LexToken(VAR,'in2',1,4020)
 LexToken(ASSIGNMENT,'=',1,4023)
 LexToken(OPENSQBRACKET,'[',1,4024)
-LexToken(NUMBER,'-2',1,4025)
+LexToken(ADDITION,'-',1,4025)
+LexToken(NUMBER,'2',1,4026)
 LexToken(SEMICOLON,';',1,4027)
-LexToken(NUMBER,'-2',1,4028)
+LexToken(ADDITION,'-',1,4028)
+LexToken(NUMBER,'2',1,4029)
 LexToken(CLOSESQBRACKET,']',1,4030)
 LexToken(COMMA,',',1,4031)
 LexToken(VAR,'intyp',1,4043)
@@ -788,11 +796,13 @@ LexToken(CLOSESQBRACKET,']',1,4053)
 LexToken(COMMA,',',1,4054)
 LexToken(VAR,'out',1,4066)
 LexToken(ASSIGNMENT,'=',1,4069)
-LexToken(NUMBER,'-1',1,4070)
+LexToken(ADDITION,'-',1,4070)
+LexToken(NUMBER,'1',1,4071)
 LexToken(COMMA,',',1,4072)
 LexToken(VAR,'out2',1,4084)
 LexToken(ASSIGNMENT,'=',1,4088)
-LexToken(NUMBER,'-2',1,4089)
+LexToken(ADDITION,'-',1,4089)
+LexToken(NUMBER,'2',1,4090)
 LexToken(COMMA,',',1,4091)
 LexToken(VAR,'outtyp',1,4103)
 LexToken(ASSIGNMENT,'=',1,4109)
@@ -985,11 +995,13 @@ LexToken(CLOSEBRACKET,')',1,4978)
 LexToken(COMMA,',',1,4979)
 LexToken(VAR,'in',1,4991)
 LexToken(ASSIGNMENT,'=',1,4993)
-LexToken(NUMBER,'-1',1,4994)
+LexToken(ADDITION,'-',1,4994)
+LexToken(NUMBER,'1',1,4995)
 LexToken(COMMA,',',1,4996)
 LexToken(VAR,'in2',1,5008)
 LexToken(ASSIGNMENT,'=',1,5011)
-LexToken(NUMBER,'-2',1,5012)
+LexToken(ADDITION,'-',1,5012)
+LexToken(NUMBER,'2',1,5013)
 LexToken(COMMA,',',1,5014)
 LexToken(VAR,'intyp',1,5026)
 LexToken(ASSIGNMENT,'=',1,5031)
@@ -997,11 +1009,13 @@ LexToken(NUMBER,'5',1,5032)
 LexToken(COMMA,',',1,5033)
 LexToken(VAR,'out',1,5045)
 LexToken(ASSIGNMENT,'=',1,5048)
-LexToken(NUMBER,'-1',1,5049)
+LexToken(ADDITION,'-',1,5049)
+LexToken(NUMBER,'1',1,5050)
 LexToken(COMMA,',',1,5051)
 LexToken(VAR,'out2',1,5063)
 LexToken(ASSIGNMENT,'=',1,5067)
-LexToken(NUMBER,'-2',1,5068)
+LexToken(ADDITION,'-',1,5068)
+LexToken(NUMBER,'2',1,5069)
 LexToken(COMMA,',',1,5070)
 LexToken(VAR,'outtyp',1,5082)
 LexToken(ASSIGNMENT,'=',1,5088)
@@ -1199,7 +1213,8 @@ LexToken(ASSIGNMENT,'=',1,5831)
 LexToken(OPENSQBRACKET,'[',1,5832)
 LexToken(NUMBER,'5',1,5833)
 LexToken(COMMA,',',1,5834)
-LexToken(NUMBER,'-1',1,5835)
+LexToken(ADDITION,'-',1,5835)
+LexToken(NUMBER,'1',1,5836)
 LexToken(CLOSESQBRACKET,']',1,5837)
 LexToken(COMMA,',',1,5838)
 LexToken(VAR,'from',1,5850)
@@ -1397,11 +1412,13 @@ LexToken(CLOSEBRACKET,')',1,6662)
 LexToken(COMMA,',',1,6663)
 LexToken(VAR,'in',1,6675)
 LexToken(ASSIGNMENT,'=',1,6677)
-LexToken(NUMBER,'-1',1,6678)
+LexToken(ADDITION,'-',1,6678)
+LexToken(NUMBER,'1',1,6679)
 LexToken(COMMA,',',1,6680)
 LexToken(VAR,'in2',1,6692)
 LexToken(ASSIGNMENT,'=',1,6695)
-LexToken(NUMBER,'-2',1,6696)
+LexToken(ADDITION,'-',1,6696)
+LexToken(NUMBER,'2',1,6697)
 LexToken(COMMA,',',1,6698)
 LexToken(VAR,'intyp',1,6710)
 LexToken(ASSIGNMENT,'=',1,6715)
@@ -1409,11 +1426,13 @@ LexToken(NUMBER,'5',1,6716)
 LexToken(COMMA,',',1,6717)
 LexToken(VAR,'out',1,6729)
 LexToken(ASSIGNMENT,'=',1,6732)
-LexToken(NUMBER,'-1',1,6733)
+LexToken(ADDITION,'-',1,6733)
+LexToken(NUMBER,'1',1,6734)
 LexToken(COMMA,',',1,6735)
 LexToken(VAR,'out2',1,6747)
 LexToken(ASSIGNMENT,'=',1,6751)
-LexToken(NUMBER,'-2',1,6752)
+LexToken(ADDITION,'-',1,6752)
+LexToken(NUMBER,'2',1,6753)
 LexToken(COMMA,',',1,6754)
 LexToken(VAR,'outtyp',1,6766)
 LexToken(ASSIGNMENT,'=',1,6772)
@@ -1684,7 +1703,8 @@ LexToken(DQSTRING,'"lsplit"',1,7844)
 LexToken(COMMA,',',1,7845)
 LexToken(VAR,'in',1,7857)
 LexToken(ASSIGNMENT,'=',1,7859)
-LexToken(NUMBER,'-1',1,7860)
+LexToken(ADDITION,'-',1,7860)
+LexToken(NUMBER,'1',1,7861)
 LexToken(COMMA,',',1,7862)
 LexToken(VAR,'in2',1,7874)
 LexToken(ASSIGNMENT,'=',1,7877)
@@ -1698,11 +1718,14 @@ LexToken(COMMA,',',1,7899)
 LexToken(VAR,'out',1,7911)
 LexToken(ASSIGNMENT,'=',1,7914)
 LexToken(OPENSQBRACKET,'[',1,7915)
-LexToken(NUMBER,'-1',1,7916)
+LexToken(ADDITION,'-',1,7916)
+LexToken(NUMBER,'1',1,7917)
 LexToken(SEMICOLON,';',1,7918)
-LexToken(NUMBER,'-1',1,7919)
+LexToken(ADDITION,'-',1,7919)
+LexToken(NUMBER,'1',1,7920)
 LexToken(SEMICOLON,';',1,7921)
-LexToken(NUMBER,'-1',1,7922)
+LexToken(ADDITION,'-',1,7922)
+LexToken(NUMBER,'1',1,7923)
 LexToken(CLOSESQBRACKET,']',1,7924)
 LexToken(COMMA,',',1,7925)
 LexToken(VAR,'out2',1,7937)
@@ -1980,7 +2003,8 @@ LexToken(NUMBER,'1',1,9054)
 LexToken(COMMA,',',1,9055)
 LexToken(VAR,'out',1,9067)
 LexToken(ASSIGNMENT,'=',1,9070)
-LexToken(NUMBER,'-1',1,9071)
+LexToken(ADDITION,'-',1,9071)
+LexToken(NUMBER,'1',1,9072)
 LexToken(COMMA,',',1,9073)
 LexToken(VAR,'out2',1,9085)
 LexToken(ASSIGNMENT,'=',1,9089)
@@ -1989,7 +2013,8 @@ LexToken(CLOSESQBRACKET,']',1,9091)
 LexToken(COMMA,',',1,9092)
 LexToken(VAR,'outtyp',1,9104)
 LexToken(ASSIGNMENT,'=',1,9110)
-LexToken(NUMBER,'-1',1,9111)
+LexToken(ADDITION,'-',1,9111)
+LexToken(NUMBER,'1',1,9112)
 LexToken(COMMA,',',1,9113)
 LexToken(VAR,'evtin',1,9125)
 LexToken(ASSIGNMENT,'=',1,9130)
@@ -2252,7 +2277,8 @@ LexToken(NUMBER,'1',1,10181)
 LexToken(COMMA,',',1,10182)
 LexToken(VAR,'out',1,10194)
 LexToken(ASSIGNMENT,'=',1,10197)
-LexToken(NUMBER,'-1',1,10198)
+LexToken(ADDITION,'-',1,10198)
+LexToken(NUMBER,'1',1,10199)
 LexToken(COMMA,',',1,10200)
 LexToken(VAR,'out2',1,10212)
 LexToken(ASSIGNMENT,'=',1,10216)
@@ -2261,7 +2287,8 @@ LexToken(CLOSESQBRACKET,']',1,10218)
 LexToken(COMMA,',',1,10219)
 LexToken(VAR,'outtyp',1,10231)
 LexToken(ASSIGNMENT,'=',1,10237)
-LexToken(NUMBER,'-1',1,10238)
+LexToken(ADDITION,'-',1,10238)
+LexToken(NUMBER,'1',1,10239)
 LexToken(COMMA,',',1,10240)
 LexToken(VAR,'evtin',1,10252)
 LexToken(ASSIGNMENT,'=',1,10257)
@@ -2510,7 +2537,8 @@ LexToken(DQSTRING,'"output"',1,11258)
 LexToken(COMMA,',',1,11259)
 LexToken(VAR,'in',1,11271)
 LexToken(ASSIGNMENT,'=',1,11273)
-LexToken(NUMBER,'-1',1,11274)
+LexToken(ADDITION,'-',1,11274)
+LexToken(NUMBER,'1',1,11275)
 LexToken(COMMA,',',1,11276)
 LexToken(VAR,'in2',1,11288)
 LexToken(ASSIGNMENT,'=',1,11291)
@@ -2519,7 +2547,8 @@ LexToken(CLOSESQBRACKET,']',1,11293)
 LexToken(COMMA,',',1,11294)
 LexToken(VAR,'intyp',1,11306)
 LexToken(ASSIGNMENT,'=',1,11311)
-LexToken(NUMBER,'-1',1,11312)
+LexToken(ADDITION,'-',1,11312)
+LexToken(NUMBER,'1',1,11313)
 LexToken(COMMA,',',1,11314)
 LexToken(VAR,'out',1,11326)
 LexToken(ASSIGNMENT,'=',1,11329)
@@ -2782,7 +2811,8 @@ LexToken(DQSTRING,'"output"',1,12389)
 LexToken(COMMA,',',1,12390)
 LexToken(VAR,'in',1,12402)
 LexToken(ASSIGNMENT,'=',1,12404)
-LexToken(NUMBER,'-1',1,12405)
+LexToken(ADDITION,'-',1,12405)
+LexToken(NUMBER,'1',1,12406)
 LexToken(COMMA,',',1,12407)
 LexToken(VAR,'in2',1,12419)
 LexToken(ASSIGNMENT,'=',1,12422)
@@ -2791,7 +2821,8 @@ LexToken(CLOSESQBRACKET,']',1,12424)
 LexToken(COMMA,',',1,12425)
 LexToken(VAR,'intyp',1,12437)
 LexToken(ASSIGNMENT,'=',1,12442)
-LexToken(NUMBER,'-1',1,12443)
+LexToken(ADDITION,'-',1,12443)
+LexToken(NUMBER,'1',1,12444)
 LexToken(COMMA,',',1,12445)
 LexToken(VAR,'out',1,12457)
 LexToken(ASSIGNMENT,'=',1,12460)
@@ -3016,7 +3047,8 @@ LexToken(VAR,'intyp',1,13246)
 LexToken(ASSIGNMENT,'=',1,13251)
 LexToken(OPENSQBRACKET,'[',1,13252)
 LexToken(NUMBER,'5',1,13253)
-LexToken(NUMBER,'-1',1,13255)
+LexToken(ADDITION,'-',1,13255)
+LexToken(NUMBER,'1',1,13256)
 LexToken(CLOSESQBRACKET,']',1,13257)
 LexToken(EOL,'\n',1,13258)
 LexToken(VAR,'model',1,13267)
diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js
index 00c260c2..9313782c 100644
--- a/js/IntegerOp/EXTRACTBITS.js
+++ b/js/IntegerOp/EXTRACTBITS.js
@@ -209,7 +209,8 @@ LexToken(NUMBER,'1',1,2110)
 LexToken(COMMA,',',1,2111)
 LexToken(DQSTRING,'"vec"',1,2116)
 LexToken(COMMA,',',1,2117)
-LexToken(NUMBER,'-1',1,2118)
+LexToken(ADDITION,'-',1,2118)
+LexToken(NUMBER,'1',1,2119)
 LexToken(COMMA,',',1,2120)
 LexToken(DQSTRING,'"vec"',1,2125)
 LexToken(COMMA,',',1,2126)
@@ -535,7 +536,7 @@ LexToken(VAR,'bit',1,4097)
 LexToken(OPENBRACKET,'(',1,4100)
 LexToken(NUMBER,'2',1,4101)
 LexToken(CLOSEBRACKET,')',1,4102)
-LexToken(OPERATOR,'-',1,4103)
+LexToken(ADDITION,'-',1,4103)
 LexToken(VAR,'bit',1,4104)
 LexToken(OPENBRACKET,'(',1,4107)
 LexToken(NUMBER,'1',1,4108)
diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js
index 76c0d8c1..661841e5 100644
--- a/js/IntegerOp/INTMUL.js
+++ b/js/IntegerOp/INTMUL.js
@@ -169,7 +169,7 @@ LexToken(EOL,'\n',1,1567)
 LexToken(VAR,'it',1,1580)
 LexToken(ASSIGNMENT,'=',1,1582)
 LexToken(VAR,'Datatype',1,1583)
-LexToken(OPERATOR,'*',1,1591)
+LexToken(MULTIPLICATION,'*',1,1591)
 LexToken(VAR,'ones',1,1592)
 LexToken(OPENBRACKET,'(',1,1596)
 LexToken(NUMBER,'1',1,1597)
@@ -730,32 +730,38 @@ LexToken(DOT,'.',1,4521)
 LexToken(VAR,'in',1,4522)
 LexToken(ASSIGNMENT,'=',1,4524)
 LexToken(OPENSQBRACKET,'[',1,4525)
-LexToken(NUMBER,'-1',1,4526)
+LexToken(ADDITION,'-',1,4526)
+LexToken(NUMBER,'1',1,4527)
 LexToken(SEMICOLON,';',1,4528)
-LexToken(NUMBER,'-2',1,4529)
+LexToken(ADDITION,'-',1,4529)
+LexToken(NUMBER,'2',1,4530)
 LexToken(CLOSESQBRACKET,']',1,4531)
 LexToken(EOL,'\n',1,4532)
 LexToken(VAR,'model',1,4541)
 LexToken(DOT,'.',1,4546)
 LexToken(VAR,'out',1,4547)
 LexToken(ASSIGNMENT,'=',1,4550)
-LexToken(NUMBER,'-1',1,4551)
+LexToken(ADDITION,'-',1,4551)
+LexToken(NUMBER,'1',1,4552)
 LexToken(EOL,'\n',1,4553)
 LexToken(VAR,'model',1,4562)
 LexToken(DOT,'.',1,4567)
 LexToken(VAR,'in2',1,4568)
 LexToken(ASSIGNMENT,'=',1,4571)
 LexToken(OPENSQBRACKET,'[',1,4572)
-LexToken(NUMBER,'-2',1,4573)
+LexToken(ADDITION,'-',1,4573)
+LexToken(NUMBER,'2',1,4574)
 LexToken(SEMICOLON,';',1,4575)
-LexToken(NUMBER,'-3',1,4576)
+LexToken(ADDITION,'-',1,4576)
+LexToken(NUMBER,'3',1,4577)
 LexToken(CLOSESQBRACKET,']',1,4578)
 LexToken(EOL,'\n',1,4579)
 LexToken(VAR,'model',1,4588)
 LexToken(DOT,'.',1,4593)
 LexToken(VAR,'out2',1,4594)
 LexToken(ASSIGNMENT,'=',1,4598)
-LexToken(NUMBER,'-3',1,4599)
+LexToken(ADDITION,'-',1,4599)
+LexToken(NUMBER,'3',1,4600)
 LexToken(EOL,'\n',1,4601)
 LexToken(VAR,'model',1,4610)
 LexToken(DOT,'.',1,4615)
diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js
index 38171542..e22ca6df 100644
--- a/js/IntegerOp/JKFLIPFLOP.js
+++ b/js/IntegerOp/JKFLIPFLOP.js
@@ -344,7 +344,7 @@ LexToken(VAR,'size',1,2539)
 LexToken(OPENBRACKET,'(',1,2543)
 LexToken(VAR,'newpar',1,2544)
 LexToken(CLOSEBRACKET,')',1,2550)
-LexToken(OPERATOR,'+',1,2551)
+LexToken(ADDITION,'+',1,2551)
 LexToken(NUMBER,'1',1,2552)
 LexToken(CLOSEBRACKET,')',1,2553)
 LexToken(ASSIGNMENT,'=',1,2554)
@@ -1025,7 +1025,8 @@ LexToken(CLOSESQBRACKET,']',1,5277)
 LexToken(COMMA,',',1,5278)
 LexToken(VAR,'ipar',1,5290)
 LexToken(ASSIGNMENT,'=',1,5294)
-LexToken(NUMBER,'-1',1,5295)
+LexToken(ADDITION,'-',1,5295)
+LexToken(NUMBER,'1',1,5296)
 LexToken(COMMA,',',1,5297)
 LexToken(VAR,'opar',1,5309)
 LexToken(ASSIGNMENT,'=',1,5313)
@@ -1176,7 +1177,8 @@ LexToken(VAR,'list',1,5942)
 LexToken(OPENBRACKET,'(',1,5946)
 LexToken(DQSTRING,'"ifthel"',1,5954)
 LexToken(COMMA,',',1,5955)
-LexToken(NUMBER,'-1',1,5956)
+LexToken(ADDITION,'-',1,5956)
+LexToken(NUMBER,'1',1,5957)
 LexToken(CLOSEBRACKET,')',1,5958)
 LexToken(COMMA,',',1,5959)
 LexToken(VAR,'in',1,5971)
@@ -1258,9 +1260,11 @@ LexToken(COMMA,',',1,6266)
 LexToken(VAR,'firing',1,6278)
 LexToken(ASSIGNMENT,'=',1,6284)
 LexToken(OPENSQBRACKET,'[',1,6285)
-LexToken(NUMBER,'-1',1,6286)
+LexToken(ADDITION,'-',1,6286)
+LexToken(NUMBER,'1',1,6287)
 LexToken(COMMA,',',1,6288)
-LexToken(NUMBER,'-1',1,6289)
+LexToken(ADDITION,'-',1,6289)
+LexToken(NUMBER,'1',1,6290)
 LexToken(CLOSESQBRACKET,']',1,6291)
 LexToken(COMMA,',',1,6292)
 LexToken(VAR,'dep_ut',1,6304)
@@ -1474,7 +1478,8 @@ LexToken(NUMBER,'1',1,7155)
 LexToken(COMMA,',',1,7156)
 LexToken(VAR,'out',1,7168)
 LexToken(ASSIGNMENT,'=',1,7171)
-LexToken(NUMBER,'-1',1,7172)
+LexToken(ADDITION,'-',1,7172)
+LexToken(NUMBER,'1',1,7173)
 LexToken(COMMA,',',1,7174)
 LexToken(VAR,'out2',1,7186)
 LexToken(ASSIGNMENT,'=',1,7190)
@@ -1880,7 +1885,8 @@ LexToken(ASSIGNMENT,'=',1,8856)
 LexToken(OPENSQBRACKET,'[',1,8857)
 LexToken(NUMBER,'5',1,8858)
 LexToken(COMMA,',',1,8859)
-LexToken(NUMBER,'-1',1,8860)
+LexToken(ADDITION,'-',1,8860)
+LexToken(NUMBER,'1',1,8861)
 LexToken(CLOSESQBRACKET,']',1,8862)
 LexToken(COMMA,',',1,8863)
 LexToken(VAR,'from',1,8875)
@@ -1997,7 +2003,8 @@ LexToken(DQSTRING,'"csuper"',1,9348)
 LexToken(COMMA,',',1,9349)
 LexToken(VAR,'in',1,9361)
 LexToken(ASSIGNMENT,'=',1,9363)
-LexToken(NUMBER,'-1',1,9364)
+LexToken(ADDITION,'-',1,9364)
+LexToken(NUMBER,'1',1,9365)
 LexToken(COMMA,',',1,9366)
 LexToken(VAR,'in2',1,9378)
 LexToken(ASSIGNMENT,'=',1,9381)
@@ -2605,7 +2612,8 @@ LexToken(DQSTRING,'"lsplit"',1,11757)
 LexToken(COMMA,',',1,11758)
 LexToken(VAR,'in',1,11770)
 LexToken(ASSIGNMENT,'=',1,11772)
-LexToken(NUMBER,'-1',1,11773)
+LexToken(ADDITION,'-',1,11773)
+LexToken(NUMBER,'1',1,11774)
 LexToken(COMMA,',',1,11775)
 LexToken(VAR,'in2',1,11787)
 LexToken(ASSIGNMENT,'=',1,11790)
@@ -2619,11 +2627,14 @@ LexToken(COMMA,',',1,11812)
 LexToken(VAR,'out',1,11824)
 LexToken(ASSIGNMENT,'=',1,11827)
 LexToken(OPENSQBRACKET,'[',1,11828)
-LexToken(NUMBER,'-1',1,11829)
+LexToken(ADDITION,'-',1,11829)
+LexToken(NUMBER,'1',1,11830)
 LexToken(SEMICOLON,';',1,11831)
-LexToken(NUMBER,'-1',1,11832)
+LexToken(ADDITION,'-',1,11832)
+LexToken(NUMBER,'1',1,11833)
 LexToken(SEMICOLON,';',1,11834)
-LexToken(NUMBER,'-1',1,11835)
+LexToken(ADDITION,'-',1,11835)
+LexToken(NUMBER,'1',1,11836)
 LexToken(CLOSESQBRACKET,']',1,11837)
 LexToken(COMMA,',',1,11838)
 LexToken(VAR,'out2',1,11850)
@@ -2840,7 +2851,8 @@ LexToken(ASSIGNMENT,'=',1,12673)
 LexToken(OPENSQBRACKET,'[',1,12674)
 LexToken(NUMBER,'5',1,12675)
 LexToken(COMMA,',',1,12676)
-LexToken(NUMBER,'-1',1,12677)
+LexToken(ADDITION,'-',1,12677)
+LexToken(NUMBER,'1',1,12678)
 LexToken(CLOSESQBRACKET,']',1,12679)
 LexToken(COMMA,',',1,12680)
 LexToken(VAR,'from',1,12692)
@@ -2968,11 +2980,13 @@ LexToken(CLOSEBRACKET,')',1,13194)
 LexToken(COMMA,',',1,13195)
 LexToken(VAR,'in',1,13207)
 LexToken(ASSIGNMENT,'=',1,13209)
-LexToken(NUMBER,'-1',1,13210)
+LexToken(ADDITION,'-',1,13210)
+LexToken(NUMBER,'1',1,13211)
 LexToken(COMMA,',',1,13212)
 LexToken(VAR,'in2',1,13224)
 LexToken(ASSIGNMENT,'=',1,13227)
-LexToken(NUMBER,'-2',1,13228)
+LexToken(ADDITION,'-',1,13228)
+LexToken(NUMBER,'2',1,13229)
 LexToken(COMMA,',',1,13230)
 LexToken(VAR,'intyp',1,13242)
 LexToken(ASSIGNMENT,'=',1,13247)
@@ -2980,11 +2994,13 @@ LexToken(NUMBER,'5',1,13248)
 LexToken(COMMA,',',1,13249)
 LexToken(VAR,'out',1,13261)
 LexToken(ASSIGNMENT,'=',1,13264)
-LexToken(NUMBER,'-1',1,13265)
+LexToken(ADDITION,'-',1,13265)
+LexToken(NUMBER,'1',1,13266)
 LexToken(COMMA,',',1,13267)
 LexToken(VAR,'out2',1,13279)
 LexToken(ASSIGNMENT,'=',1,13283)
-LexToken(NUMBER,'-2',1,13284)
+LexToken(ADDITION,'-',1,13284)
+LexToken(NUMBER,'2',1,13285)
 LexToken(COMMA,',',1,13286)
 LexToken(VAR,'outtyp',1,13298)
 LexToken(ASSIGNMENT,'=',1,13304)
@@ -3180,7 +3196,8 @@ LexToken(DQSTRING,'"lsplit"',1,14126)
 LexToken(COMMA,',',1,14127)
 LexToken(VAR,'in',1,14139)
 LexToken(ASSIGNMENT,'=',1,14141)
-LexToken(NUMBER,'-1',1,14142)
+LexToken(ADDITION,'-',1,14142)
+LexToken(NUMBER,'1',1,14143)
 LexToken(COMMA,',',1,14144)
 LexToken(VAR,'in2',1,14156)
 LexToken(ASSIGNMENT,'=',1,14159)
@@ -3194,11 +3211,14 @@ LexToken(COMMA,',',1,14181)
 LexToken(VAR,'out',1,14193)
 LexToken(ASSIGNMENT,'=',1,14196)
 LexToken(OPENSQBRACKET,'[',1,14197)
-LexToken(NUMBER,'-1',1,14198)
+LexToken(ADDITION,'-',1,14198)
+LexToken(NUMBER,'1',1,14199)
 LexToken(SEMICOLON,';',1,14200)
-LexToken(NUMBER,'-1',1,14201)
+LexToken(ADDITION,'-',1,14201)
+LexToken(NUMBER,'1',1,14202)
 LexToken(SEMICOLON,';',1,14203)
-LexToken(NUMBER,'-1',1,14204)
+LexToken(ADDITION,'-',1,14204)
+LexToken(NUMBER,'1',1,14205)
 LexToken(CLOSESQBRACKET,']',1,14206)
 LexToken(COMMA,',',1,14207)
 LexToken(VAR,'out2',1,14219)
@@ -3538,7 +3558,8 @@ LexToken(NUMBER,'1',1,15550)
 LexToken(COMMA,',',1,15551)
 LexToken(VAR,'out',1,15563)
 LexToken(ASSIGNMENT,'=',1,15566)
-LexToken(NUMBER,'-1',1,15567)
+LexToken(ADDITION,'-',1,15567)
+LexToken(NUMBER,'1',1,15568)
 LexToken(COMMA,',',1,15569)
 LexToken(VAR,'out2',1,15581)
 LexToken(ASSIGNMENT,'=',1,15585)
@@ -3547,7 +3568,8 @@ LexToken(CLOSESQBRACKET,']',1,15587)
 LexToken(COMMA,',',1,15588)
 LexToken(VAR,'outtyp',1,15600)
 LexToken(ASSIGNMENT,'=',1,15606)
-LexToken(NUMBER,'-1',1,15607)
+LexToken(ADDITION,'-',1,15607)
+LexToken(NUMBER,'1',1,15608)
 LexToken(COMMA,',',1,15609)
 LexToken(VAR,'evtin',1,15621)
 LexToken(ASSIGNMENT,'=',1,15626)
@@ -3806,7 +3828,8 @@ LexToken(NUMBER,'1',1,16669)
 LexToken(COMMA,',',1,16670)
 LexToken(VAR,'out',1,16682)
 LexToken(ASSIGNMENT,'=',1,16685)
-LexToken(NUMBER,'-1',1,16686)
+LexToken(ADDITION,'-',1,16686)
+LexToken(NUMBER,'1',1,16687)
 LexToken(COMMA,',',1,16688)
 LexToken(VAR,'out2',1,16700)
 LexToken(ASSIGNMENT,'=',1,16704)
@@ -3815,7 +3838,8 @@ LexToken(CLOSESQBRACKET,']',1,16706)
 LexToken(COMMA,',',1,16707)
 LexToken(VAR,'outtyp',1,16719)
 LexToken(ASSIGNMENT,'=',1,16725)
-LexToken(NUMBER,'-1',1,16726)
+LexToken(ADDITION,'-',1,16726)
+LexToken(NUMBER,'1',1,16727)
 LexToken(COMMA,',',1,16728)
 LexToken(VAR,'evtin',1,16740)
 LexToken(ASSIGNMENT,'=',1,16745)
@@ -4074,7 +4098,8 @@ LexToken(NUMBER,'1',1,17786)
 LexToken(COMMA,',',1,17787)
 LexToken(VAR,'out',1,17799)
 LexToken(ASSIGNMENT,'=',1,17802)
-LexToken(NUMBER,'-1',1,17803)
+LexToken(ADDITION,'-',1,17803)
+LexToken(NUMBER,'1',1,17804)
 LexToken(COMMA,',',1,17805)
 LexToken(VAR,'out2',1,17817)
 LexToken(ASSIGNMENT,'=',1,17821)
@@ -4083,7 +4108,8 @@ LexToken(CLOSESQBRACKET,']',1,17823)
 LexToken(COMMA,',',1,17824)
 LexToken(VAR,'outtyp',1,17836)
 LexToken(ASSIGNMENT,'=',1,17842)
-LexToken(NUMBER,'-1',1,17843)
+LexToken(ADDITION,'-',1,17843)
+LexToken(NUMBER,'1',1,17844)
 LexToken(COMMA,',',1,17845)
 LexToken(VAR,'evtin',1,17857)
 LexToken(ASSIGNMENT,'=',1,17862)
@@ -4328,7 +4354,8 @@ LexToken(DQSTRING,'"output"',1,18852)
 LexToken(COMMA,',',1,18853)
 LexToken(VAR,'in',1,18865)
 LexToken(ASSIGNMENT,'=',1,18867)
-LexToken(NUMBER,'-1',1,18868)
+LexToken(ADDITION,'-',1,18868)
+LexToken(NUMBER,'1',1,18869)
 LexToken(COMMA,',',1,18870)
 LexToken(VAR,'in2',1,18882)
 LexToken(ASSIGNMENT,'=',1,18885)
@@ -4337,7 +4364,8 @@ LexToken(CLOSESQBRACKET,']',1,18887)
 LexToken(COMMA,',',1,18888)
 LexToken(VAR,'intyp',1,18900)
 LexToken(ASSIGNMENT,'=',1,18905)
-LexToken(NUMBER,'-1',1,18906)
+LexToken(ADDITION,'-',1,18906)
+LexToken(NUMBER,'1',1,18907)
 LexToken(COMMA,',',1,18908)
 LexToken(VAR,'out',1,18920)
 LexToken(ASSIGNMENT,'=',1,18923)
@@ -4596,7 +4624,8 @@ LexToken(DQSTRING,'"output"',1,19973)
 LexToken(COMMA,',',1,19974)
 LexToken(VAR,'in',1,19986)
 LexToken(ASSIGNMENT,'=',1,19988)
-LexToken(NUMBER,'-1',1,19989)
+LexToken(ADDITION,'-',1,19989)
+LexToken(NUMBER,'1',1,19990)
 LexToken(COMMA,',',1,19991)
 LexToken(VAR,'in2',1,20003)
 LexToken(ASSIGNMENT,'=',1,20006)
@@ -4605,7 +4634,8 @@ LexToken(CLOSESQBRACKET,']',1,20008)
 LexToken(COMMA,',',1,20009)
 LexToken(VAR,'intyp',1,20021)
 LexToken(ASSIGNMENT,'=',1,20026)
-LexToken(NUMBER,'-1',1,20027)
+LexToken(ADDITION,'-',1,20027)
+LexToken(NUMBER,'1',1,20028)
 LexToken(COMMA,',',1,20029)
 LexToken(VAR,'out',1,20041)
 LexToken(ASSIGNMENT,'=',1,20044)
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index c3295914..7d882b7c 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -158,9 +158,11 @@ LexToken(OPENBRACKET,'(',1,1628)
 LexToken(DQSTRING,'"mat"',1,1633)
 LexToken(COMMA,',',1,1634)
 LexToken(OPENSQBRACKET,'[',1,1635)
-LexToken(NUMBER,'-1',1,1636)
+LexToken(ADDITION,'-',1,1636)
+LexToken(NUMBER,'1',1,1637)
 LexToken(COMMA,',',1,1638)
-LexToken(NUMBER,'-2',1,1639)
+LexToken(ADDITION,'-',1,1639)
+LexToken(NUMBER,'2',1,1640)
 LexToken(CLOSESQBRACKET,']',1,1641)
 LexToken(COMMA,',',1,1642)
 LexToken(DQSTRING,'"vec"',1,1647)
@@ -204,7 +206,7 @@ LexToken(COMMA,',',1,1783)
 LexToken(NUMBER,'1',1,1784)
 LexToken(CLOSEBRACKET,')',1,1785)
 LexToken(CLOSEBRACKET,')',1,1786)
-LexToken(OPERATOR,'/',1,1787)
+LexToken(MULTIPLICATION,'/',1,1787)
 LexToken(VAR,'log',1,1788)
 LexToken(OPENBRACKET,'(',1,1791)
 LexToken(NUMBER,'2',1,1792)
@@ -404,7 +406,7 @@ LexToken(EOL,'\n',1,2888)
 LexToken(VAR,'it',1,2905)
 LexToken(ASSIGNMENT,'=',1,2907)
 LexToken(NUMBER,'5',1,2908)
-LexToken(OPERATOR,'*',1,2909)
+LexToken(MULTIPLICATION,'*',1,2909)
 LexToken(VAR,'ones',1,2910)
 LexToken(OPENBRACKET,'(',1,2914)
 LexToken(NUMBER,'1',1,2915)
@@ -415,7 +417,7 @@ LexToken(EOL,'\n',1,2921)
 LexToken(VAR,'ot',1,2938)
 LexToken(ASSIGNMENT,'=',1,2940)
 LexToken(NUMBER,'5',1,2941)
-LexToken(OPERATOR,'*',1,2942)
+LexToken(MULTIPLICATION,'*',1,2942)
 LexToken(VAR,'ones',1,2943)
 LexToken(OPENBRACKET,'(',1,2947)
 LexToken(NUMBER,'1',1,2948)
@@ -454,7 +456,7 @@ LexToken(COMMA,',',1,3038)
 LexToken(VAR,'ones',1,3039)
 LexToken(OPENBRACKET,'(',1,3043)
 LexToken(NUMBER,'1',1,3044)
-LexToken(OPERATOR,'-',1,3045)
+LexToken(ADDITION,'-',1,3045)
 LexToken(VAR,'herit',1,3046)
 LexToken(COMMA,',',1,3051)
 LexToken(NUMBER,'1',1,3052)
diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js
index 4723bf88..5ad98cb5 100644
--- a/js/IntegerOp/SHIFT.js
+++ b/js/IntegerOp/SHIFT.js
@@ -650,9 +650,11 @@ LexToken(COMMA,',',1,4730)
 LexToken(VAR,'list',1,4751)
 LexToken(OPENBRACKET,'(',1,4755)
 LexToken(OPENSQBRACKET,'[',1,4756)
-LexToken(NUMBER,'-1',1,4757)
+LexToken(ADDITION,'-',1,4757)
+LexToken(NUMBER,'1',1,4758)
 LexToken(COMMA,',',1,4759)
-LexToken(NUMBER,'-2',1,4760)
+LexToken(ADDITION,'-',1,4760)
+LexToken(NUMBER,'2',1,4761)
 LexToken(CLOSESQBRACKET,']',1,4762)
 LexToken(COMMA,',',1,4763)
 LexToken(VAR,'it',1,4764)
@@ -661,9 +663,11 @@ LexToken(COMMA,',',1,4767)
 LexToken(VAR,'list',1,4788)
 LexToken(OPENBRACKET,'(',1,4792)
 LexToken(OPENSQBRACKET,'[',1,4793)
-LexToken(NUMBER,'-1',1,4794)
+LexToken(ADDITION,'-',1,4794)
+LexToken(NUMBER,'1',1,4795)
 LexToken(COMMA,',',1,4796)
-LexToken(NUMBER,'-2',1,4797)
+LexToken(ADDITION,'-',1,4797)
+LexToken(NUMBER,'2',1,4798)
 LexToken(CLOSESQBRACKET,']',1,4799)
 LexToken(COMMA,',',1,4800)
 LexToken(VAR,'ot',1,4801)
@@ -751,25 +755,29 @@ LexToken(VAR,'model',1,5169)
 LexToken(DOT,'.',1,5174)
 LexToken(VAR,'in',1,5175)
 LexToken(ASSIGNMENT,'=',1,5177)
-LexToken(NUMBER,'-1',1,5178)
+LexToken(ADDITION,'-',1,5178)
+LexToken(NUMBER,'1',1,5179)
 LexToken(EOL,'\n',1,5180)
 LexToken(VAR,'model',1,5189)
 LexToken(DOT,'.',1,5194)
 LexToken(VAR,'out',1,5195)
 LexToken(ASSIGNMENT,'=',1,5198)
-LexToken(NUMBER,'-1',1,5199)
+LexToken(ADDITION,'-',1,5199)
+LexToken(NUMBER,'1',1,5200)
 LexToken(EOL,'\n',1,5201)
 LexToken(VAR,'model',1,5210)
 LexToken(DOT,'.',1,5215)
 LexToken(VAR,'in2',1,5216)
 LexToken(ASSIGNMENT,'=',1,5219)
-LexToken(NUMBER,'-2',1,5220)
+LexToken(ADDITION,'-',1,5220)
+LexToken(NUMBER,'2',1,5221)
 LexToken(EOL,'\n',1,5222)
 LexToken(VAR,'model',1,5231)
 LexToken(DOT,'.',1,5236)
 LexToken(VAR,'out2',1,5237)
 LexToken(ASSIGNMENT,'=',1,5241)
-LexToken(NUMBER,'-2',1,5242)
+LexToken(ADDITION,'-',1,5242)
+LexToken(NUMBER,'2',1,5243)
 LexToken(EOL,'\n',1,5244)
 LexToken(VAR,'model',1,5253)
 LexToken(DOT,'.',1,5258)
diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js
index 829fb03f..65ac1903 100644
--- a/js/IntegerOp/SRFLIPFLOP.js
+++ b/js/IntegerOp/SRFLIPFLOP.js
@@ -343,7 +343,7 @@ LexToken(VAR,'size',1,2467)
 LexToken(OPENBRACKET,'(',1,2471)
 LexToken(VAR,'newpar',1,2472)
 LexToken(CLOSEBRACKET,')',1,2478)
-LexToken(OPERATOR,'+',1,2479)
+LexToken(ADDITION,'+',1,2479)
 LexToken(NUMBER,'1',1,2480)
 LexToken(CLOSEBRACKET,')',1,2481)
 LexToken(ASSIGNMENT,'=',1,2482)
@@ -1264,7 +1264,8 @@ LexToken(DQSTRING,'"lsplit"',1,6096)
 LexToken(COMMA,',',1,6097)
 LexToken(VAR,'in',1,6109)
 LexToken(ASSIGNMENT,'=',1,6111)
-LexToken(NUMBER,'-1',1,6112)
+LexToken(ADDITION,'-',1,6112)
+LexToken(NUMBER,'1',1,6113)
 LexToken(COMMA,',',1,6114)
 LexToken(VAR,'in2',1,6126)
 LexToken(ASSIGNMENT,'=',1,6129)
@@ -1278,11 +1279,14 @@ LexToken(COMMA,',',1,6151)
 LexToken(VAR,'out',1,6163)
 LexToken(ASSIGNMENT,'=',1,6166)
 LexToken(OPENSQBRACKET,'[',1,6167)
-LexToken(NUMBER,'-1',1,6168)
+LexToken(ADDITION,'-',1,6168)
+LexToken(NUMBER,'1',1,6169)
 LexToken(SEMICOLON,';',1,6170)
-LexToken(NUMBER,'-1',1,6171)
+LexToken(ADDITION,'-',1,6171)
+LexToken(NUMBER,'1',1,6172)
 LexToken(SEMICOLON,';',1,6173)
-LexToken(NUMBER,'-1',1,6174)
+LexToken(ADDITION,'-',1,6174)
+LexToken(NUMBER,'1',1,6175)
 LexToken(CLOSESQBRACKET,']',1,6176)
 LexToken(COMMA,',',1,6177)
 LexToken(VAR,'out2',1,6189)
@@ -1542,7 +1546,8 @@ LexToken(DQSTRING,'"output"',1,7238)
 LexToken(COMMA,',',1,7239)
 LexToken(VAR,'in',1,7251)
 LexToken(ASSIGNMENT,'=',1,7253)
-LexToken(NUMBER,'-1',1,7254)
+LexToken(ADDITION,'-',1,7254)
+LexToken(NUMBER,'1',1,7255)
 LexToken(COMMA,',',1,7256)
 LexToken(VAR,'in2',1,7268)
 LexToken(ASSIGNMENT,'=',1,7271)
@@ -1551,7 +1556,8 @@ LexToken(CLOSESQBRACKET,']',1,7273)
 LexToken(COMMA,',',1,7274)
 LexToken(VAR,'intyp',1,7286)
 LexToken(ASSIGNMENT,'=',1,7291)
-LexToken(NUMBER,'-1',1,7292)
+LexToken(ADDITION,'-',1,7292)
+LexToken(NUMBER,'1',1,7293)
 LexToken(COMMA,',',1,7294)
 LexToken(VAR,'out',1,7306)
 LexToken(ASSIGNMENT,'=',1,7309)
@@ -1824,7 +1830,8 @@ LexToken(NUMBER,'1',1,8405)
 LexToken(COMMA,',',1,8406)
 LexToken(VAR,'out',1,8418)
 LexToken(ASSIGNMENT,'=',1,8421)
-LexToken(NUMBER,'-1',1,8422)
+LexToken(ADDITION,'-',1,8422)
+LexToken(NUMBER,'1',1,8423)
 LexToken(COMMA,',',1,8424)
 LexToken(VAR,'out2',1,8436)
 LexToken(ASSIGNMENT,'=',1,8440)
@@ -1833,7 +1840,8 @@ LexToken(CLOSESQBRACKET,']',1,8442)
 LexToken(COMMA,',',1,8443)
 LexToken(VAR,'outtyp',1,8455)
 LexToken(ASSIGNMENT,'=',1,8461)
-LexToken(NUMBER,'-1',1,8462)
+LexToken(ADDITION,'-',1,8462)
+LexToken(NUMBER,'1',1,8463)
 LexToken(COMMA,',',1,8464)
 LexToken(VAR,'evtin',1,8476)
 LexToken(ASSIGNMENT,'=',1,8481)
@@ -2092,7 +2100,8 @@ LexToken(NUMBER,'1',1,9524)
 LexToken(COMMA,',',1,9525)
 LexToken(VAR,'out',1,9537)
 LexToken(ASSIGNMENT,'=',1,9540)
-LexToken(NUMBER,'-1',1,9541)
+LexToken(ADDITION,'-',1,9541)
+LexToken(NUMBER,'1',1,9542)
 LexToken(COMMA,',',1,9543)
 LexToken(VAR,'out2',1,9555)
 LexToken(ASSIGNMENT,'=',1,9559)
@@ -2101,7 +2110,8 @@ LexToken(CLOSESQBRACKET,']',1,9561)
 LexToken(COMMA,',',1,9562)
 LexToken(VAR,'outtyp',1,9574)
 LexToken(ASSIGNMENT,'=',1,9580)
-LexToken(NUMBER,'-1',1,9581)
+LexToken(ADDITION,'-',1,9581)
+LexToken(NUMBER,'1',1,9582)
 LexToken(COMMA,',',1,9583)
 LexToken(VAR,'evtin',1,9595)
 LexToken(ASSIGNMENT,'=',1,9600)
@@ -2346,7 +2356,8 @@ LexToken(DQSTRING,'"output"',1,10590)
 LexToken(COMMA,',',1,10591)
 LexToken(VAR,'in',1,10603)
 LexToken(ASSIGNMENT,'=',1,10605)
-LexToken(NUMBER,'-1',1,10606)
+LexToken(ADDITION,'-',1,10606)
+LexToken(NUMBER,'1',1,10607)
 LexToken(COMMA,',',1,10608)
 LexToken(VAR,'in2',1,10620)
 LexToken(ASSIGNMENT,'=',1,10623)
@@ -2355,7 +2366,8 @@ LexToken(CLOSESQBRACKET,']',1,10625)
 LexToken(COMMA,',',1,10626)
 LexToken(VAR,'intyp',1,10638)
 LexToken(ASSIGNMENT,'=',1,10643)
-LexToken(NUMBER,'-1',1,10644)
+LexToken(ADDITION,'-',1,10644)
+LexToken(NUMBER,'1',1,10645)
 LexToken(COMMA,',',1,10646)
 LexToken(VAR,'out',1,10658)
 LexToken(ASSIGNMENT,'=',1,10661)