add make rules for generating debug files

20 files changed, 392 insertions, 239 deletions

diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index 03ac487a..64a02333 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -392,7 +392,7 @@ LexToken(COMMA,',',1,3064)
 LexToken(VAR,'ones',1,3066)
 LexToken(OPENBRACKET,'(',1,3070)
 LexToken(NUMBER,'1',1,3071)
-LexToken(OPERATOR,'-',1,3072)
+LexToken(ADDITION,'-',1,3072)
 LexToken(VAR,'herit',1,3073)
 LexToken(COMMA,',',1,3078)
 LexToken(NUMBER,'1',1,3079)
@@ -438,7 +438,8 @@ LexToken(DOT,'.',1,3213)
 LexToken(VAR,'dstate',1,3214)
 LexToken(ASSIGNMENT,'=',1,3221)
 LexToken(OPENSQBRACKET,'[',1,3223)
-LexToken(NUMBER,'-1',1,3224)
+LexToken(ADDITION,'-',1,3224)
+LexToken(NUMBER,'1',1,3225)
 LexToken(SEMICOLON,';',1,3226)
 LexToken(NUMBER,'0',1,3227)
 LexToken(SEMICOLON,';',1,3228)
@@ -458,7 +459,7 @@ LexToken(NUMBER,'1',1,3246)
 LexToken(COMMA,',',1,3247)
 LexToken(NUMBER,'1',1,3248)
 LexToken(CLOSEBRACKET,')',1,3249)
-LexToken(OPERATOR,'*',1,3250)
+LexToken(MULTIPLICATION,'*',1,3250)
 LexToken(VAR,'in',1,3251)
 LexToken(OPENBRACKET,'(',1,3253)
 LexToken(NUMBER,'1',1,3254)
@@ -477,7 +478,7 @@ LexToken(ASSIGNMENT,'=',1,3291)
 LexToken(VAR,'ones',1,3293)
 LexToken(OPENBRACKET,'(',1,3297)
 LexToken(NUMBER,'1',1,3298)
-LexToken(OPERATOR,'-',1,3299)
+LexToken(ADDITION,'-',1,3299)
 LexToken(VAR,'herit',1,3300)
 LexToken(COMMA,',',1,3305)
 LexToken(NUMBER,'1',1,3306)
@@ -600,7 +601,8 @@ LexToken(DOT,'.',1,3772)
 LexToken(VAR,'dstate',1,3773)
 LexToken(ASSIGNMENT,'=',1,3780)
 LexToken(OPENSQBRACKET,'[',1,3782)
-LexToken(NUMBER,'-1',1,3783)
+LexToken(ADDITION,'-',1,3783)
+LexToken(NUMBER,'1',1,3784)
 LexToken(SEMICOLON,';',1,3785)
 LexToken(NUMBER,'0',1,3786)
 LexToken(SEMICOLON,';',1,3787)
@@ -620,7 +622,7 @@ LexToken(NUMBER,'1',1,3805)
 LexToken(COMMA,',',1,3806)
 LexToken(NUMBER,'1',1,3807)
 LexToken(CLOSEBRACKET,')',1,3808)
-LexToken(OPERATOR,'*',1,3809)
+LexToken(MULTIPLICATION,'*',1,3809)
 LexToken(VAR,'in',1,3810)
 LexToken(OPENBRACKET,'(',1,3812)
 LexToken(NUMBER,'1',1,3813)
diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js
index b815911b..4eb60cc8 100644
--- a/js/Sinks/BARXY.js
+++ b/js/Sinks/BARXY.js
@@ -292,7 +292,8 @@ LexToken(SEMICOLON,';',1,1768)
 LexToken(EOL,'\n',1,1769)
 LexToken(VAR,'xmin',1,1778)
 LexToken(ASSIGNMENT,'=',1,1783)
-LexToken(NUMBER,'-15',1,1785)
+LexToken(ADDITION,'-',1,1785)
+LexToken(NUMBER,'15',1,1786)
 LexToken(SEMICOLON,';',1,1788)
 LexToken(EOL,'\n',1,1789)
 LexToken(VAR,'xmax',1,1798)
@@ -302,7 +303,8 @@ LexToken(SEMICOLON,';',1,1807)
 LexToken(EOL,'\n',1,1808)
 LexToken(VAR,'ymin',1,1817)
 LexToken(ASSIGNMENT,'=',1,1822)
-LexToken(NUMBER,'-15',1,1824)
+LexToken(ADDITION,'-',1,1824)
+LexToken(NUMBER,'15',1,1825)
 LexToken(SEMICOLON,';',1,1827)
 LexToken(EOL,'\n',1,1828)
 LexToken(VAR,'ymax',1,1837)
@@ -343,9 +345,11 @@ LexToken(DOT,'.',1,1959)
 LexToken(VAR,'in',1,1960)
 LexToken(ASSIGNMENT,'=',1,1962)
 LexToken(OPENSQBRACKET,'[',1,1963)
-LexToken(NUMBER,'-1',1,1964)
+LexToken(ADDITION,'-',1,1964)
+LexToken(NUMBER,'1',1,1965)
 LexToken(SEMICOLON,';',1,1966)
-LexToken(NUMBER,'-1',1,1967)
+LexToken(ADDITION,'-',1,1967)
+LexToken(NUMBER,'1',1,1968)
 LexToken(CLOSESQBRACKET,']',1,1969)
 LexToken(SEMICOLON,';',1,1970)
 LexToken(EOL,'\n',1,1971)
diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js
index 85d61b9c..8efafe7c 100644
--- a/js/Sinks/CANIMXY.js
+++ b/js/Sinks/CANIMXY.js
@@ -170,11 +170,13 @@ LexToken(NUMBER,'1',1,1667)
 LexToken(COMMA,',',1,1668)
 LexToken(DQSTRING,'"vec"',1,1673)
 LexToken(COMMA,',',1,1674)
-LexToken(NUMBER,'-1',1,1675)
+LexToken(ADDITION,'-',1,1675)
+LexToken(NUMBER,'1',1,1676)
 LexToken(COMMA,',',1,1677)
 LexToken(DQSTRING,'"vec"',1,1682)
 LexToken(COMMA,',',1,1683)
-LexToken(NUMBER,'-1',1,1684)
+LexToken(ADDITION,'-',1,1684)
+LexToken(NUMBER,'1',1,1685)
 LexToken(COMMA,',',1,1686)
 LexToken(DQSTRING,'"vec"',1,1691)
 LexToken(COMMA,',',1,1692)
@@ -291,7 +293,8 @@ LexToken(EOL,'\n',1,2195)
 LexToken(IF,'if',1,2208)
 LexToken(VAR,'win',1,2211)
 LexToken(COMPARISON,'<',1,2214)
-LexToken(NUMBER,'-1',1,2215)
+LexToken(ADDITION,'-',1,2215)
+LexToken(NUMBER,'1',1,2216)
 LexToken(THEN,'then',1,2218)
 LexToken(EOL,'\n',1,2222)
 LexToken(VAR,'mess',1,2239)
@@ -439,7 +442,7 @@ LexToken(EOL,'\n',1,3088)
 LexToken(VAR,'in',1,3105)
 LexToken(ASSIGNMENT,'=',1,3108)
 LexToken(VAR,'nbr_curves',1,3110)
-LexToken(OPERATOR,'*',1,3120)
+LexToken(MULTIPLICATION,'*',1,3120)
 LexToken(VAR,'ones',1,3121)
 LexToken(OPENBRACKET,'(',1,3125)
 LexToken(NUMBER,'2',1,3126)
@@ -513,9 +516,11 @@ LexToken(EOL,'\n',1,3302)
 LexToken(VAR,'wpos',1,3323)
 LexToken(ASSIGNMENT,'=',1,3327)
 LexToken(OPENSQBRACKET,'[',1,3328)
-LexToken(NUMBER,'-1',1,3329)
+LexToken(ADDITION,'-',1,3329)
+LexToken(NUMBER,'1',1,3330)
 LexToken(SEMICOLON,';',1,3331)
-LexToken(NUMBER,'-1',1,3332)
+LexToken(ADDITION,'-',1,3332)
+LexToken(NUMBER,'1',1,3333)
 LexToken(CLOSESQBRACKET,']',1,3334)
 LexToken(SEMICOLON,';',1,3335)
 LexToken(EOL,'\n',1,3336)
@@ -531,9 +536,11 @@ LexToken(EOL,'\n',1,3389)
 LexToken(VAR,'wdim',1,3410)
 LexToken(ASSIGNMENT,'=',1,3414)
 LexToken(OPENSQBRACKET,'[',1,3415)
-LexToken(NUMBER,'-1',1,3416)
+LexToken(ADDITION,'-',1,3416)
+LexToken(NUMBER,'1',1,3417)
 LexToken(SEMICOLON,';',1,3418)
-LexToken(NUMBER,'-1',1,3419)
+LexToken(ADDITION,'-',1,3419)
+LexToken(NUMBER,'1',1,3420)
 LexToken(CLOSESQBRACKET,']',1,3421)
 LexToken(SEMICOLON,';',1,3422)
 LexToken(EOL,'\n',1,3423)
@@ -626,12 +633,14 @@ LexToken(THEN,'then',1,3911)
 LexToken(EOL,'\n',1,3915)
 LexToken(VAR,'win',1,3924)
 LexToken(ASSIGNMENT,'=',1,3927)
-LexToken(NUMBER,'-1',1,3928)
+LexToken(ADDITION,'-',1,3928)
+LexToken(NUMBER,'1',1,3929)
 LexToken(SEMICOLON,';',1,3930)
 LexToken(EOL,'\n',1,3931)
 LexToken(VAR,'clrs',1,3940)
 LexToken(ASSIGNMENT,'=',1,3944)
-LexToken(NUMBER,'-4',1,3945)
+LexToken(ADDITION,'-',1,3945)
+LexToken(NUMBER,'4',1,3946)
 LexToken(SEMICOLON,';',1,3947)
 LexToken(EOL,'\n',1,3948)
 LexToken(VAR,'N',1,3957)
@@ -647,24 +656,29 @@ LexToken(EOL,'\n',1,3976)
 LexToken(VAR,'wpos',1,3985)
 LexToken(ASSIGNMENT,'=',1,3989)
 LexToken(OPENSQBRACKET,'[',1,3990)
-LexToken(NUMBER,'-1',1,3991)
+LexToken(ADDITION,'-',1,3991)
+LexToken(NUMBER,'1',1,3992)
 LexToken(SEMICOLON,';',1,3993)
-LexToken(NUMBER,'-1',1,3994)
+LexToken(ADDITION,'-',1,3994)
+LexToken(NUMBER,'1',1,3995)
 LexToken(CLOSESQBRACKET,']',1,3996)
 LexToken(SEMICOLON,';',1,3997)
 LexToken(EOL,'\n',1,3998)
 LexToken(VAR,'wdim',1,4007)
 LexToken(ASSIGNMENT,'=',1,4011)
 LexToken(OPENSQBRACKET,'[',1,4012)
-LexToken(NUMBER,'-1',1,4013)
+LexToken(ADDITION,'-',1,4013)
+LexToken(NUMBER,'1',1,4014)
 LexToken(SEMICOLON,';',1,4015)
-LexToken(NUMBER,'-1',1,4016)
+LexToken(ADDITION,'-',1,4016)
+LexToken(NUMBER,'1',1,4017)
 LexToken(CLOSESQBRACKET,']',1,4018)
 LexToken(SEMICOLON,';',1,4019)
 LexToken(EOL,'\n',1,4020)
 LexToken(VAR,'xmin',1,4029)
 LexToken(ASSIGNMENT,'=',1,4033)
-LexToken(NUMBER,'-15',1,4034)
+LexToken(ADDITION,'-',1,4034)
+LexToken(NUMBER,'15',1,4035)
 LexToken(SEMICOLON,';',1,4037)
 LexToken(EOL,'\n',1,4038)
 LexToken(VAR,'xmax',1,4047)
@@ -674,12 +688,13 @@ LexToken(SEMICOLON,';',1,4054)
 LexToken(EOL,'\n',1,4055)
 LexToken(VAR,'ymin',1,4064)
 LexToken(ASSIGNMENT,'=',1,4068)
-LexToken(NUMBER,'-15',1,4069)
+LexToken(ADDITION,'-',1,4069)
+LexToken(NUMBER,'15',1,4070)
 LexToken(SEMICOLON,';',1,4072)
 LexToken(EOL,'\n',1,4073)
 LexToken(VAR,'ymax',1,4082)
 LexToken(ASSIGNMENT,'=',1,4086)
-LexToken(OPERATOR,'+',1,4087)
+LexToken(ADDITION,'+',1,4087)
 LexToken(NUMBER,'15',1,4088)
 LexToken(EOL,'\n',1,4090)
 LexToken(VAR,'nbr_curves',1,4099)
diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js
index 5508cac4..fb51406f 100644
--- a/js/Sinks/CANIMXY3D.js
+++ b/js/Sinks/CANIMXY3D.js
@@ -156,11 +156,13 @@ LexToken(NUMBER,'1',1,1659)
 LexToken(COMMA,',',1,1660)
 LexToken(DQSTRING,'"vec"',1,1665)
 LexToken(COMMA,',',1,1666)
-LexToken(NUMBER,'-1',1,1667)
+LexToken(ADDITION,'-',1,1667)
+LexToken(NUMBER,'1',1,1668)
 LexToken(COMMA,',',1,1669)
 LexToken(DQSTRING,'"vec"',1,1674)
 LexToken(COMMA,',',1,1675)
-LexToken(NUMBER,'-1',1,1676)
+LexToken(ADDITION,'-',1,1676)
+LexToken(NUMBER,'1',1,1677)
 LexToken(COMMA,',',1,1678)
 LexToken(DQSTRING,'"vec"',1,1683)
 LexToken(COMMA,',',1,1684)
@@ -168,27 +170,33 @@ LexToken(NUMBER,'1',1,1685)
 LexToken(COMMA,',',1,1686)
 LexToken(DQSTRING,'"vec"',1,1691)
 LexToken(COMMA,',',1,1692)
-LexToken(NUMBER,'-1',1,1693)
+LexToken(ADDITION,'-',1,1693)
+LexToken(NUMBER,'1',1,1694)
 LexToken(COMMA,',',1,1695)
 LexToken(DQSTRING,'"vec"',1,1700)
 LexToken(COMMA,',',1,1701)
-LexToken(NUMBER,'-1',1,1702)
+LexToken(ADDITION,'-',1,1702)
+LexToken(NUMBER,'1',1,1703)
 LexToken(COMMA,',',1,1704)
 LexToken(DQSTRING,'"vec"',1,1709)
 LexToken(COMMA,',',1,1710)
-LexToken(NUMBER,'-1',1,1711)
+LexToken(ADDITION,'-',1,1711)
+LexToken(NUMBER,'1',1,1712)
 LexToken(COMMA,',',1,1713)
 LexToken(DQSTRING,'"vec"',1,1718)
 LexToken(COMMA,',',1,1719)
-LexToken(NUMBER,'-1',1,1720)
+LexToken(ADDITION,'-',1,1720)
+LexToken(NUMBER,'1',1,1721)
 LexToken(COMMA,',',1,1722)
 LexToken(DQSTRING,'"vec"',1,1727)
 LexToken(COMMA,',',1,1728)
-LexToken(NUMBER,'-1',1,1729)
+LexToken(ADDITION,'-',1,1729)
+LexToken(NUMBER,'1',1,1730)
 LexToken(COMMA,',',1,1731)
 LexToken(DQSTRING,'"vec"',1,1736)
 LexToken(COMMA,',',1,1737)
-LexToken(NUMBER,'-1',1,1738)
+LexToken(ADDITION,'-',1,1738)
+LexToken(NUMBER,'1',1,1739)
 LexToken(COMMA,',',1,1740)
 LexToken(DQSTRING,'"vec"',1,1745)
 LexToken(COMMA,',',1,1746)
@@ -288,7 +296,8 @@ LexToken(EOL,'\n',1,2201)
 LexToken(IF,'if',1,2214)
 LexToken(VAR,'win',1,2217)
 LexToken(COMPARISON,'<',1,2220)
-LexToken(NUMBER,'-1',1,2221)
+LexToken(ADDITION,'-',1,2221)
+LexToken(NUMBER,'1',1,2222)
 LexToken(THEN,'then',1,2224)
 LexToken(EOL,'\n',1,2228)
 LexToken(VAR,'mess',1,2245)
@@ -550,7 +559,7 @@ LexToken(EOL,'\n',1,3741)
 LexToken(VAR,'in',1,3758)
 LexToken(ASSIGNMENT,'=',1,3761)
 LexToken(VAR,'nbr_curves',1,3763)
-LexToken(OPERATOR,'*',1,3773)
+LexToken(MULTIPLICATION,'*',1,3773)
 LexToken(VAR,'ones',1,3774)
 LexToken(OPENBRACKET,'(',1,3778)
 LexToken(NUMBER,'3',1,3779)
@@ -624,9 +633,11 @@ LexToken(EOL,'\n',1,3955)
 LexToken(VAR,'wpos',1,3976)
 LexToken(ASSIGNMENT,'=',1,3980)
 LexToken(OPENSQBRACKET,'[',1,3981)
-LexToken(NUMBER,'-1',1,3982)
+LexToken(ADDITION,'-',1,3982)
+LexToken(NUMBER,'1',1,3983)
 LexToken(SEMICOLON,';',1,3984)
-LexToken(NUMBER,'-1',1,3985)
+LexToken(ADDITION,'-',1,3985)
+LexToken(NUMBER,'1',1,3986)
 LexToken(CLOSESQBRACKET,']',1,3987)
 LexToken(SEMICOLON,';',1,3988)
 LexToken(EOL,'\n',1,3989)
@@ -642,9 +653,11 @@ LexToken(EOL,'\n',1,4042)
 LexToken(VAR,'wdim',1,4063)
 LexToken(ASSIGNMENT,'=',1,4067)
 LexToken(OPENSQBRACKET,'[',1,4068)
-LexToken(NUMBER,'-1',1,4069)
+LexToken(ADDITION,'-',1,4069)
+LexToken(NUMBER,'1',1,4070)
 LexToken(SEMICOLON,';',1,4071)
-LexToken(NUMBER,'-1',1,4072)
+LexToken(ADDITION,'-',1,4072)
+LexToken(NUMBER,'1',1,4073)
 LexToken(CLOSESQBRACKET,']',1,4074)
 LexToken(SEMICOLON,';',1,4075)
 LexToken(EOL,'\n',1,4076)
@@ -763,7 +776,8 @@ LexToken(THEN,'then',1,4521)
 LexToken(EOL,'\n',1,4525)
 LexToken(VAR,'win',1,4534)
 LexToken(ASSIGNMENT,'=',1,4537)
-LexToken(NUMBER,'-1',1,4538)
+LexToken(ADDITION,'-',1,4538)
+LexToken(NUMBER,'1',1,4539)
 LexToken(SEMICOLON,';',1,4540)
 LexToken(EOL,'\n',1,4541)
 LexToken(VAR,'N',1,4550)
@@ -814,18 +828,22 @@ LexToken(EOL,'\n',1,4620)
 LexToken(VAR,'wpos',1,4629)
 LexToken(ASSIGNMENT,'=',1,4633)
 LexToken(OPENSQBRACKET,'[',1,4634)
-LexToken(NUMBER,'-1',1,4635)
+LexToken(ADDITION,'-',1,4635)
+LexToken(NUMBER,'1',1,4636)
 LexToken(SEMICOLON,';',1,4637)
-LexToken(NUMBER,'-1',1,4638)
+LexToken(ADDITION,'-',1,4638)
+LexToken(NUMBER,'1',1,4639)
 LexToken(CLOSESQBRACKET,']',1,4640)
 LexToken(SEMICOLON,';',1,4641)
 LexToken(EOL,'\n',1,4642)
 LexToken(VAR,'wdim',1,4651)
 LexToken(ASSIGNMENT,'=',1,4655)
 LexToken(OPENSQBRACKET,'[',1,4656)
-LexToken(NUMBER,'-1',1,4657)
+LexToken(ADDITION,'-',1,4657)
+LexToken(NUMBER,'1',1,4658)
 LexToken(SEMICOLON,';',1,4659)
-LexToken(NUMBER,'-1',1,4660)
+LexToken(ADDITION,'-',1,4660)
+LexToken(NUMBER,'1',1,4661)
 LexToken(CLOSESQBRACKET,']',1,4662)
 LexToken(SEMICOLON,';',1,4663)
 LexToken(EOL,'\n',1,4664)
@@ -840,7 +858,8 @@ LexToken(EOL,'\n',1,4690)
 LexToken(VAR,'vec_x',1,4699)
 LexToken(ASSIGNMENT,'=',1,4705)
 LexToken(OPENSQBRACKET,'[',1,4707)
-LexToken(NUMBER,'-15',1,4708)
+LexToken(ADDITION,'-',1,4708)
+LexToken(NUMBER,'15',1,4709)
 LexToken(SEMICOLON,';',1,4711)
 LexToken(NUMBER,'15',1,4712)
 LexToken(CLOSESQBRACKET,']',1,4714)
@@ -848,7 +867,8 @@ LexToken(EOL,'\n',1,4715)
 LexToken(VAR,'vec_y',1,4724)
 LexToken(ASSIGNMENT,'=',1,4730)
 LexToken(OPENSQBRACKET,'[',1,4732)
-LexToken(NUMBER,'-15',1,4733)
+LexToken(ADDITION,'-',1,4733)
+LexToken(NUMBER,'15',1,4734)
 LexToken(SEMICOLON,';',1,4736)
 LexToken(NUMBER,'15',1,4737)
 LexToken(CLOSESQBRACKET,']',1,4739)
@@ -856,7 +876,8 @@ LexToken(EOL,'\n',1,4740)
 LexToken(VAR,'vec_z',1,4749)
 LexToken(ASSIGNMENT,'=',1,4755)
 LexToken(OPENSQBRACKET,'[',1,4757)
-LexToken(NUMBER,'-15',1,4758)
+LexToken(ADDITION,'-',1,4758)
+LexToken(NUMBER,'15',1,4759)
 LexToken(SEMICOLON,';',1,4761)
 LexToken(NUMBER,'15',1,4762)
 LexToken(CLOSESQBRACKET,']',1,4764)
diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js
index d31c4a8a..c6911475 100644
--- a/js/Sinks/CEVENTSCOPE.js
+++ b/js/Sinks/CEVENTSCOPE.js
@@ -135,7 +135,8 @@ LexToken(NUMBER,'1',1,1444)
 LexToken(COMMA,',',1,1445)
 LexToken(DQSTRING,'"vec"',1,1450)
 LexToken(COMMA,',',1,1451)
-LexToken(NUMBER,'-1',1,1452)
+LexToken(ADDITION,'-',1,1452)
+LexToken(NUMBER,'1',1,1453)
 LexToken(COMMA,',',1,1454)
 LexToken(DQSTRING,'"vec"',1,1459)
 LexToken(COMMA,',',1,1460)
@@ -143,11 +144,13 @@ LexToken(NUMBER,'1',1,1461)
 LexToken(COMMA,',',1,1462)
 LexToken(DQSTRING,'"vec"',1,1467)
 LexToken(COMMA,',',1,1468)
-LexToken(NUMBER,'-1',1,1469)
+LexToken(ADDITION,'-',1,1469)
+LexToken(NUMBER,'1',1,1470)
 LexToken(COMMA,',',1,1471)
 LexToken(DQSTRING,'"vec"',1,1476)
 LexToken(COMMA,',',1,1477)
-LexToken(NUMBER,'-1',1,1478)
+LexToken(ADDITION,'-',1,1478)
+LexToken(NUMBER,'1',1,1479)
 LexToken(COMMA,',',1,1480)
 LexToken(DQSTRING,'"vec"',1,1485)
 LexToken(COMMA,',',1,1486)
@@ -319,7 +322,8 @@ LexToken(EOL,'\n',1,2338)
 LexToken(IF,'if',1,2351)
 LexToken(VAR,'win',1,2354)
 LexToken(COMPARISON,'<',1,2357)
-LexToken(NUMBER,'-1',1,2358)
+LexToken(ADDITION,'-',1,2358)
+LexToken(NUMBER,'1',1,2359)
 LexToken(THEN,'then',1,2361)
 LexToken(EOL,'\n',1,2365)
 LexToken(VAR,'mess',1,2382)
@@ -426,9 +430,11 @@ LexToken(EOL,'\n',1,2907)
 LexToken(VAR,'wpos',1,2928)
 LexToken(ASSIGNMENT,'=',1,2932)
 LexToken(OPENSQBRACKET,'[',1,2933)
-LexToken(NUMBER,'-1',1,2934)
+LexToken(ADDITION,'-',1,2934)
+LexToken(NUMBER,'1',1,2935)
 LexToken(SEMICOLON,';',1,2936)
-LexToken(NUMBER,'-1',1,2937)
+LexToken(ADDITION,'-',1,2937)
+LexToken(NUMBER,'1',1,2938)
 LexToken(CLOSESQBRACKET,']',1,2939)
 LexToken(SEMICOLON,';',1,2940)
 LexToken(EOL,'\n',1,2941)
@@ -444,9 +450,11 @@ LexToken(EOL,'\n',1,2994)
 LexToken(VAR,'wdim',1,3015)
 LexToken(ASSIGNMENT,'=',1,3019)
 LexToken(OPENSQBRACKET,'[',1,3020)
-LexToken(NUMBER,'-1',1,3021)
+LexToken(ADDITION,'-',1,3021)
+LexToken(NUMBER,'1',1,3022)
 LexToken(SEMICOLON,';',1,3023)
-LexToken(NUMBER,'-1',1,3024)
+LexToken(ADDITION,'-',1,3024)
+LexToken(NUMBER,'1',1,3025)
 LexToken(CLOSESQBRACKET,']',1,3026)
 LexToken(SEMICOLON,';',1,3027)
 LexToken(EOL,'\n',1,3028)
@@ -528,7 +536,8 @@ LexToken(NUMBER,'1',1,3385)
 LexToken(EOL,'\n',1,3386)
 LexToken(VAR,'win',1,3395)
 LexToken(ASSIGNMENT,'=',1,3398)
-LexToken(NUMBER,'-1',1,3399)
+LexToken(ADDITION,'-',1,3399)
+LexToken(NUMBER,'1',1,3400)
 LexToken(SEMICOLON,';',1,3401)
 LexToken(EOL,'\n',1,3402)
 LexToken(VAR,'clrs',1,3411)
@@ -563,9 +572,11 @@ LexToken(EOL,'\n',1,3460)
 LexToken(VAR,'wpos',1,3469)
 LexToken(ASSIGNMENT,'=',1,3473)
 LexToken(OPENSQBRACKET,'[',1,3474)
-LexToken(NUMBER,'-1',1,3475)
+LexToken(ADDITION,'-',1,3475)
+LexToken(NUMBER,'1',1,3476)
 LexToken(SEMICOLON,';',1,3477)
-LexToken(NUMBER,'-1',1,3478)
+LexToken(ADDITION,'-',1,3478)
+LexToken(NUMBER,'1',1,3479)
 LexToken(CLOSESQBRACKET,']',1,3480)
 LexToken(EOL,'\n',1,3481)
 LexToken(VAR,'per',1,3490)
diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js
index 6f0a9b33..edb77239 100644
--- a/js/Sinks/CFSCOPE.js
+++ b/js/Sinks/CFSCOPE.js
@@ -152,11 +152,13 @@ LexToken(NUMBER,'1',1,1556)
 LexToken(COMMA,',',1,1557)
 LexToken(DQSTRING,'"vec"',1,1562)
 LexToken(COMMA,',',1,1563)
-LexToken(NUMBER,'-1',1,1564)
+LexToken(ADDITION,'-',1,1564)
+LexToken(NUMBER,'1',1,1565)
 LexToken(COMMA,',',1,1566)
 LexToken(DQSTRING,'"vec"',1,1571)
 LexToken(COMMA,',',1,1572)
-LexToken(NUMBER,'-1',1,1573)
+LexToken(ADDITION,'-',1,1573)
+LexToken(NUMBER,'1',1,1574)
 LexToken(COMMA,',',1,1575)
 LexToken(DQSTRING,'"vec"',1,1580)
 LexToken(COMMA,',',1,1581)
@@ -176,7 +178,8 @@ LexToken(NUMBER,'1',1,1621)
 LexToken(COMMA,',',1,1622)
 LexToken(DQSTRING,'"vec"',1,1627)
 LexToken(COMMA,',',1,1628)
-LexToken(NUMBER,'-1',1,1629)
+LexToken(ADDITION,'-',1,1629)
+LexToken(NUMBER,'1',1,1630)
 LexToken(CLOSEBRACKET,')',1,1631)
 LexToken(COMMA,',',1,1632)
 LexToken(VAR,'exprs',1,1648)
@@ -272,7 +275,8 @@ LexToken(EOL,'\n',1,2099)
 LexToken(IF,'if',1,2112)
 LexToken(VAR,'win',1,2115)
 LexToken(COMPARISON,'<',1,2118)
-LexToken(NUMBER,'-1',1,2119)
+LexToken(ADDITION,'-',1,2119)
+LexToken(NUMBER,'1',1,2120)
 LexToken(THEN,'then',1,2122)
 LexToken(EOL,'\n',1,2126)
 LexToken(VAR,'mess',1,2143)
@@ -411,9 +415,11 @@ LexToken(EOL,'\n',1,2949)
 LexToken(VAR,'wpos',1,2970)
 LexToken(ASSIGNMENT,'=',1,2974)
 LexToken(OPENSQBRACKET,'[',1,2975)
-LexToken(NUMBER,'-1',1,2976)
+LexToken(ADDITION,'-',1,2976)
+LexToken(NUMBER,'1',1,2977)
 LexToken(SEMICOLON,';',1,2978)
-LexToken(NUMBER,'-1',1,2979)
+LexToken(ADDITION,'-',1,2979)
+LexToken(NUMBER,'1',1,2980)
 LexToken(CLOSESQBRACKET,']',1,2981)
 LexToken(SEMICOLON,';',1,2982)
 LexToken(EOL,'\n',1,2983)
@@ -429,9 +435,11 @@ LexToken(EOL,'\n',1,3036)
 LexToken(VAR,'wdim',1,3057)
 LexToken(ASSIGNMENT,'=',1,3061)
 LexToken(OPENSQBRACKET,'[',1,3062)
-LexToken(NUMBER,'-1',1,3063)
+LexToken(ADDITION,'-',1,3063)
+LexToken(NUMBER,'1',1,3064)
 LexToken(SEMICOLON,';',1,3065)
-LexToken(NUMBER,'-1',1,3066)
+LexToken(ADDITION,'-',1,3066)
+LexToken(NUMBER,'1',1,3067)
 LexToken(CLOSESQBRACKET,']',1,3068)
 LexToken(SEMICOLON,';',1,3069)
 LexToken(EOL,'\n',1,3070)
@@ -593,7 +601,8 @@ LexToken(THEN,'then',1,3856)
 LexToken(EOL,'\n',1,3860)
 LexToken(VAR,'win',1,3869)
 LexToken(ASSIGNMENT,'=',1,3872)
-LexToken(NUMBER,'-1',1,3873)
+LexToken(ADDITION,'-',1,3873)
+LexToken(NUMBER,'1',1,3874)
 LexToken(SEMICOLON,';',1,3875)
 LexToken(EOL,'\n',1,3876)
 LexToken(VAR,'wdim',1,3885)
@@ -607,9 +616,11 @@ LexToken(EOL,'\n',1,3899)
 LexToken(VAR,'wpos',1,3908)
 LexToken(ASSIGNMENT,'=',1,3912)
 LexToken(OPENSQBRACKET,'[',1,3913)
-LexToken(NUMBER,'-1',1,3914)
+LexToken(ADDITION,'-',1,3914)
+LexToken(NUMBER,'1',1,3915)
 LexToken(SEMICOLON,';',1,3916)
-LexToken(NUMBER,'-1',1,3917)
+LexToken(ADDITION,'-',1,3917)
+LexToken(NUMBER,'1',1,3918)
 LexToken(CLOSESQBRACKET,']',1,3919)
 LexToken(EOL,'\n',1,3920)
 LexToken(VAR,'clrs',1,3929)
@@ -640,12 +651,13 @@ LexToken(SEMICOLON,';',1,3967)
 LexToken(EOL,'\n',1,3968)
 LexToken(VAR,'ymin',1,3977)
 LexToken(ASSIGNMENT,'=',1,3981)
-LexToken(NUMBER,'-15',1,3982)
+LexToken(ADDITION,'-',1,3982)
+LexToken(NUMBER,'15',1,3983)
 LexToken(SEMICOLON,';',1,3985)
 LexToken(EOL,'\n',1,3986)
 LexToken(VAR,'ymax',1,3995)
 LexToken(ASSIGNMENT,'=',1,3999)
-LexToken(OPERATOR,'+',1,4000)
+LexToken(ADDITION,'+',1,4000)
 LexToken(NUMBER,'15',1,4001)
 LexToken(SEMICOLON,';',1,4003)
 LexToken(EOL,'\n',1,4004)
diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js
index bedbd5ef..6e3d5fd7 100644
--- a/js/Sinks/CLKOUTV_f.js
+++ b/js/Sinks/CLKOUTV_f.js
@@ -123,7 +123,8 @@ LexToken(DQSTRING,'"pattern"',1,1229)
 LexToken(COMMA,',',1,1230)
 LexToken(VAR,'default_color',1,1231)
 LexToken(OPENBRACKET,'(',1,1244)
-LexToken(NUMBER,'-1',1,1245)
+LexToken(ADDITION,'-',1,1245)
+LexToken(NUMBER,'1',1,1246)
 LexToken(CLOSEBRACKET,')',1,1247)
 LexToken(CLOSEBRACKET,')',1,1248)
 LexToken(SEMICOLON,';',1,1249)
@@ -150,15 +151,15 @@ LexToken(VAR,'orig',1,1323)
 LexToken(OPENBRACKET,'(',1,1327)
 LexToken(NUMBER,'1',1,1328)
 LexToken(CLOSEBRACKET,')',1,1329)
-LexToken(OPERATOR,'+',1,1330)
+LexToken(ADDITION,'+',1,1330)
 LexToken(VAR,'sz',1,1331)
 LexToken(OPENBRACKET,'(',1,1333)
 LexToken(NUMBER,'1',1,1334)
 LexToken(CLOSEBRACKET,')',1,1335)
-LexToken(OPERATOR,'*',1,1336)
+LexToken(MULTIPLICATION,'*',1,1336)
 LexToken(OPENSQBRACKET,'[',1,1337)
 LexToken(NUMBER,'1',1,1338)
-LexToken(OPERATOR,'/',1,1339)
+LexToken(MULTIPLICATION,'/',1,1339)
 LexToken(NUMBER,'2',1,1340)
 LexToken(SEMICOLON,';',1,1341)
 LexToken(NUMBER,'1',1,1342)
@@ -177,17 +178,17 @@ LexToken(VAR,'orig',1,1366)
 LexToken(OPENBRACKET,'(',1,1370)
 LexToken(NUMBER,'2',1,1371)
 LexToken(CLOSEBRACKET,')',1,1372)
-LexToken(OPERATOR,'+',1,1373)
+LexToken(ADDITION,'+',1,1373)
 LexToken(VAR,'sz',1,1374)
 LexToken(OPENBRACKET,'(',1,1376)
 LexToken(NUMBER,'2',1,1377)
 LexToken(CLOSEBRACKET,')',1,1378)
-LexToken(OPERATOR,'*',1,1379)
+LexToken(MULTIPLICATION,'*',1,1379)
 LexToken(OPENSQBRACKET,'[',1,1380)
 LexToken(NUMBER,'0',1,1381)
 LexToken(SEMICOLON,';',1,1382)
 LexToken(NUMBER,'1',1,1385)
-LexToken(OPERATOR,'/',1,1386)
+LexToken(MULTIPLICATION,'/',1,1386)
 LexToken(NUMBER,'3',1,1387)
 LexToken(SEMICOLON,';',1,1388)
 LexToken(NUMBER,'1',1,1389)
@@ -195,7 +196,7 @@ LexToken(SEMICOLON,';',1,1390)
 LexToken(NUMBER,'1',1,1391)
 LexToken(SEMICOLON,';',1,1392)
 LexToken(NUMBER,'1',1,1393)
-LexToken(OPERATOR,'/',1,1394)
+LexToken(MULTIPLICATION,'/',1,1394)
 LexToken(NUMBER,'3',1,1395)
 LexToken(CLOSESQBRACKET,']',1,1396)
 LexToken(SEMICOLON,';',1,1397)
@@ -214,12 +215,12 @@ LexToken(VAR,'orig',1,1430)
 LexToken(OPENBRACKET,'(',1,1434)
 LexToken(NUMBER,'2',1,1435)
 LexToken(CLOSEBRACKET,')',1,1436)
-LexToken(OPERATOR,'+',1,1437)
+LexToken(ADDITION,'+',1,1437)
 LexToken(VAR,'sz',1,1438)
 LexToken(OPENBRACKET,'(',1,1440)
 LexToken(NUMBER,'2',1,1441)
 LexToken(CLOSEBRACKET,')',1,1442)
-LexToken(OPERATOR,'/',1,1443)
+LexToken(MULTIPLICATION,'/',1,1443)
 LexToken(NUMBER,'3',1,1444)
 LexToken(SEMICOLON,';',1,1445)
 LexToken(EOL,'\n',1,1446)
@@ -296,7 +297,7 @@ LexToken(VAR,'sz',1,1683)
 LexToken(OPENBRACKET,'(',1,1685)
 LexToken(NUMBER,'2',1,1686)
 LexToken(CLOSEBRACKET,')',1,1687)
-LexToken(OPERATOR,'/',1,1688)
+LexToken(MULTIPLICATION,'/',1,1688)
 LexToken(NUMBER,'1.5',1,1689)
 LexToken(CLOSEBRACKET,')',1,1692)
 LexToken(SEMICOLON,';',1,1693)
@@ -329,7 +330,7 @@ LexToken(VAR,'sz',1,1775)
 LexToken(OPENBRACKET,'(',1,1777)
 LexToken(NUMBER,'2',1,1778)
 LexToken(CLOSEBRACKET,')',1,1779)
-LexToken(OPERATOR,'/',1,1780)
+LexToken(MULTIPLICATION,'/',1,1780)
 LexToken(NUMBER,'1.5',1,1781)
 LexToken(CLOSEBRACKET,')',1,1784)
 LexToken(SEMICOLON,';',1,1785)
@@ -356,7 +357,7 @@ LexToken(VAR,'sz',1,1845)
 LexToken(OPENBRACKET,'(',1,1847)
 LexToken(NUMBER,'2',1,1848)
 LexToken(CLOSEBRACKET,')',1,1849)
-LexToken(OPERATOR,'/',1,1850)
+LexToken(MULTIPLICATION,'/',1,1850)
 LexToken(NUMBER,'1.5',1,1851)
 LexToken(CLOSEBRACKET,')',1,1854)
 LexToken(SEMICOLON,';',1,1855)
@@ -378,28 +379,30 @@ LexToken(EOL,'\n',1,1902)
 LexToken(VAR,'in',1,1911)
 LexToken(ASSIGNMENT,'=',1,1913)
 LexToken(OPENSQBRACKET,'[',1,1915)
-LexToken(NUMBER,'-1',1,1916)
-LexToken(OPERATOR,'/',1,1918)
+LexToken(ADDITION,'-',1,1916)
+LexToken(NUMBER,'1',1,1917)
+LexToken(MULTIPLICATION,'/',1,1918)
 LexToken(NUMBER,'14',1,1919)
 LexToken(NUMBER,'1',1,1923)
-LexToken(OPERATOR,'/',1,1924)
+LexToken(MULTIPLICATION,'/',1,1924)
 LexToken(NUMBER,'7',1,1925)
 LexToken(NUMBER,'0',1,1935)
 LexToken(NUMBER,'0',1,1942)
 LexToken(NUMBER,'1',1,1952)
-LexToken(OPERATOR,'/',1,1953)
+LexToken(MULTIPLICATION,'/',1,1953)
 LexToken(NUMBER,'14',1,1954)
 LexToken(NUMBER,'1',1,1959)
-LexToken(OPERATOR,'/',1,1960)
+LexToken(MULTIPLICATION,'/',1,1960)
 LexToken(NUMBER,'7',1,1961)
-LexToken(NUMBER,'-1',1,1971)
-LexToken(OPERATOR,'/',1,1973)
+LexToken(ADDITION,'-',1,1971)
+LexToken(NUMBER,'1',1,1972)
+LexToken(MULTIPLICATION,'/',1,1973)
 LexToken(NUMBER,'14',1,1974)
 LexToken(NUMBER,'1',1,1978)
-LexToken(OPERATOR,'/',1,1979)
+LexToken(MULTIPLICATION,'/',1,1979)
 LexToken(NUMBER,'7',1,1980)
 LexToken(CLOSESQBRACKET,']',1,1981)
-LexToken(OPERATOR,'*',1,1982)
+LexToken(MULTIPLICATION,'*',1,1982)
 LexToken(VAR,'diag',1,1983)
 LexToken(OPENBRACKET,'(',1,1987)
 LexToken(OPENSQBRACKET,'[',1,1988)
@@ -418,25 +421,25 @@ LexToken(COLON,':',1,2016)
 LexToken(COMMA,',',1,2017)
 LexToken(NUMBER,'1',1,2018)
 LexToken(CLOSEBRACKET,')',1,2019)
-LexToken(OPERATOR,'+',1,2020)
+LexToken(ADDITION,'+',1,2020)
 LexToken(VAR,'ones',1,2021)
 LexToken(OPENBRACKET,'(',1,2025)
 LexToken(NUMBER,'4',1,2026)
 LexToken(COMMA,',',1,2027)
 LexToken(NUMBER,'1',1,2028)
 LexToken(CLOSEBRACKET,')',1,2029)
-LexToken(OPERATOR,'*',1,2030)
+LexToken(MULTIPLICATION,'*',1,2030)
 LexToken(OPENBRACKET,'(',1,2031)
 LexToken(VAR,'orig',1,2032)
 LexToken(OPENBRACKET,'(',1,2036)
 LexToken(NUMBER,'1',1,2037)
 LexToken(CLOSEBRACKET,')',1,2038)
-LexToken(OPERATOR,'+',1,2039)
+LexToken(ADDITION,'+',1,2039)
 LexToken(VAR,'sz',1,2040)
 LexToken(OPENBRACKET,'(',1,2042)
 LexToken(NUMBER,'1',1,2043)
 LexToken(CLOSEBRACKET,')',1,2044)
-LexToken(OPERATOR,'/',1,2045)
+LexToken(MULTIPLICATION,'/',1,2045)
 LexToken(NUMBER,'2',1,2046)
 LexToken(CLOSEBRACKET,')',1,2047)
 LexToken(COMMA,',',1,2048)
@@ -446,20 +449,20 @@ LexToken(COLON,':',1,2063)
 LexToken(COMMA,',',1,2064)
 LexToken(NUMBER,'2',1,2065)
 LexToken(CLOSEBRACKET,')',1,2066)
-LexToken(OPERATOR,'+',1,2067)
+LexToken(ADDITION,'+',1,2067)
 LexToken(VAR,'ones',1,2068)
 LexToken(OPENBRACKET,'(',1,2072)
 LexToken(NUMBER,'4',1,2073)
 LexToken(COMMA,',',1,2074)
 LexToken(NUMBER,'1',1,2075)
 LexToken(CLOSEBRACKET,')',1,2076)
-LexToken(OPERATOR,'*',1,2077)
+LexToken(MULTIPLICATION,'*',1,2077)
 LexToken(OPENBRACKET,'(',1,2078)
 LexToken(VAR,'orig',1,2079)
 LexToken(OPENBRACKET,'(',1,2083)
 LexToken(NUMBER,'2',1,2084)
 LexToken(CLOSEBRACKET,')',1,2085)
-LexToken(OPERATOR,'+',1,2086)
+LexToken(ADDITION,'+',1,2086)
 LexToken(VAR,'sz',1,2087)
 LexToken(OPENBRACKET,'(',1,2089)
 LexToken(NUMBER,'2',1,2090)
@@ -580,26 +583,27 @@ LexToken(VAR,'orig',1,2469)
 LexToken(OPENBRACKET,'(',1,2473)
 LexToken(NUMBER,'1',1,2474)
 LexToken(CLOSEBRACKET,')',1,2475)
-LexToken(OPERATOR,'+',1,2476)
+LexToken(ADDITION,'+',1,2476)
 LexToken(VAR,'sz',1,2477)
 LexToken(OPENBRACKET,'(',1,2479)
 LexToken(NUMBER,'1',1,2480)
 LexToken(CLOSEBRACKET,')',1,2481)
-LexToken(OPERATOR,'/',1,2482)
+LexToken(MULTIPLICATION,'/',1,2482)
 LexToken(NUMBER,'2',1,2483)
-LexToken(OPERATOR,'-',1,2484)
+LexToken(ADDITION,'-',1,2484)
 LexToken(VAR,'w',1,2485)
-LexToken(OPERATOR,'/',1,2486)
+LexToken(MULTIPLICATION,'/',1,2486)
 LexToken(NUMBER,'2',1,2487)
 LexToken(COMMA,',',1,2488)
 LexToken(VAR,'orig',1,2490)
 LexToken(OPENBRACKET,'(',1,2494)
 LexToken(NUMBER,'2',1,2495)
 LexToken(CLOSEBRACKET,')',1,2496)
-LexToken(NUMBER,'-3',1,2497)
-LexToken(OPERATOR,'*',1,2499)
+LexToken(ADDITION,'-',1,2497)
+LexToken(NUMBER,'3',1,2498)
+LexToken(MULTIPLICATION,'*',1,2499)
 LexToken(VAR,'h',1,2500)
-LexToken(OPERATOR,'/',1,2501)
+LexToken(MULTIPLICATION,'/',1,2501)
 LexToken(NUMBER,'2',1,2502)
 LexToken(COMMA,',',1,2504)
 LexToken(VAR,'ident',1,2506)
@@ -667,12 +671,12 @@ LexToken(VAR,'orig',1,2694)
 LexToken(OPENBRACKET,'(',1,2698)
 LexToken(NUMBER,'1',1,2699)
 LexToken(CLOSEBRACKET,')',1,2700)
-LexToken(OPERATOR,'+',1,2701)
+LexToken(ADDITION,'+',1,2701)
 LexToken(VAR,'sz',1,2702)
 LexToken(OPENBRACKET,'(',1,2704)
 LexToken(NUMBER,'1',1,2705)
 LexToken(CLOSEBRACKET,')',1,2706)
-LexToken(OPERATOR,'/',1,2707)
+LexToken(MULTIPLICATION,'/',1,2707)
 LexToken(NUMBER,'2',1,2708)
 LexToken(EOL,'\n',1,2709)
 LexToken(VAR,'y',1,2718)
@@ -681,7 +685,7 @@ LexToken(VAR,'orig',1,2720)
 LexToken(OPENBRACKET,'(',1,2724)
 LexToken(NUMBER,'2',1,2725)
 LexToken(CLOSEBRACKET,')',1,2726)
-LexToken(OPERATOR,'+',1,2727)
+LexToken(ADDITION,'+',1,2727)
 LexToken(VAR,'sz',1,2728)
 LexToken(OPENBRACKET,'(',1,2730)
 LexToken(NUMBER,'2',1,2731)
@@ -689,7 +693,7 @@ LexToken(CLOSEBRACKET,')',1,2732)
 LexToken(EOL,'\n',1,2733)
 LexToken(VAR,'typ',1,2742)
 LexToken(ASSIGNMENT,'=',1,2745)
-LexToken(OPERATOR,'-',1,2746)
+LexToken(ADDITION,'-',1,2746)
 LexToken(VAR,'ones',1,2747)
 LexToken(OPENBRACKET,'(',1,2751)
 LexToken(VAR,'x',1,2752)
diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 422e2bd0..306efbe2 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -127,15 +127,18 @@ LexToken(VAR,'list',1,1353)
 LexToken(OPENBRACKET,'(',1,1357)
 LexToken(DQSTRING,'"vec"',1,1362)
 LexToken(COMMA,',',1,1363)
-LexToken(NUMBER,'-1',1,1364)
+LexToken(ADDITION,'-',1,1364)
+LexToken(NUMBER,'1',1,1365)
 LexToken(COMMA,',',1,1366)
 LexToken(DQSTRING,'"vec"',1,1371)
 LexToken(COMMA,',',1,1372)
-LexToken(NUMBER,'-1',1,1373)
+LexToken(ADDITION,'-',1,1373)
+LexToken(NUMBER,'1',1,1374)
 LexToken(COMMA,',',1,1375)
 LexToken(DQSTRING,'"vec"',1,1380)
 LexToken(COMMA,',',1,1381)
-LexToken(NUMBER,'-1',1,1382)
+LexToken(ADDITION,'-',1,1382)
+LexToken(NUMBER,'1',1,1383)
 LexToken(COMMA,',',1,1384)
 LexToken(DQSTRING,'"vec"',1,1389)
 LexToken(COMMA,',',1,1390)
@@ -367,12 +370,14 @@ LexToken(SEMICOLON,';',1,2498)
 LexToken(EOL,'\n',1,2499)
 LexToken(VAR,'x',1,2508)
 LexToken(ASSIGNMENT,'=',1,2509)
-LexToken(NUMBER,'-1',1,2510)
+LexToken(ADDITION,'-',1,2510)
+LexToken(NUMBER,'1',1,2511)
 LexToken(SEMICOLON,';',1,2512)
 LexToken(EOL,'\n',1,2513)
 LexToken(VAR,'y',1,2522)
 LexToken(ASSIGNMENT,'=',1,2523)
-LexToken(NUMBER,'-1',1,2524)
+LexToken(ADDITION,'-',1,2524)
+LexToken(NUMBER,'1',1,2525)
 LexToken(SEMICOLON,';',1,2526)
 LexToken(EOL,'\n',1,2527)
 LexToken(VAR,'size_x',1,2536)
@@ -407,13 +412,15 @@ LexToken(VAR,'model',1,2641)
 LexToken(DOT,'.',1,2646)
 LexToken(VAR,'in',1,2647)
 LexToken(ASSIGNMENT,'=',1,2649)
-LexToken(NUMBER,'-1',1,2650)
+LexToken(ADDITION,'-',1,2650)
+LexToken(NUMBER,'1',1,2651)
 LexToken(EOL,'\n',1,2652)
 LexToken(VAR,'model',1,2661)
 LexToken(DOT,'.',1,2666)
 LexToken(VAR,'in2',1,2667)
 LexToken(ASSIGNMENT,'=',1,2670)
-LexToken(NUMBER,'-2',1,2671)
+LexToken(ADDITION,'-',1,2671)
+LexToken(NUMBER,'2',1,2672)
 LexToken(EOL,'\n',1,2673)
 LexToken(VAR,'model',1,2682)
 LexToken(DOT,'.',1,2687)
diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js
index dad15988..ac4d27cc 100644
--- a/js/Sinks/CMATVIEW.js
+++ b/js/Sinks/CMATVIEW.js
@@ -119,7 +119,8 @@ LexToken(VAR,'list',1,1275)
 LexToken(OPENBRACKET,'(',1,1279)
 LexToken(DQSTRING,'"vec"',1,1284)
 LexToken(COMMA,',',1,1285)
-LexToken(NUMBER,'-1',1,1286)
+LexToken(ADDITION,'-',1,1286)
+LexToken(NUMBER,'1',1,1287)
 LexToken(COMMA,',',1,1288)
 LexToken(DQSTRING,'"vec"',1,1293)
 LexToken(COMMA,',',1,1294)
@@ -217,12 +218,12 @@ LexToken(VAR,'cmax',1,1780)
 LexToken(NUMBER,'1',1,1785)
 LexToken(CLOSESQBRACKET,']',1,1786)
 LexToken(CLOSEBRACKET,')',1,1787)
-LexToken(OPERATOR,'*',1,1788)
+LexToken(MULTIPLICATION,'*',1,1788)
 LexToken(OPENSQBRACKET,'[',1,1789)
 LexToken(NUMBER,'1',1,1790)
 LexToken(SEMICOLON,';',1,1791)
 LexToken(VAR,'size_c',1,1792)
-LexToken(OPERATOR,'/',1,1798)
+LexToken(MULTIPLICATION,'/',1,1798)
 LexToken(NUMBER,'3',1,1799)
 LexToken(CLOSESQBRACKET,']',1,1800)
 LexToken(SEMICOLON,';',1,1801)
@@ -365,13 +366,15 @@ LexToken(VAR,'model',1,2422)
 LexToken(DOT,'.',1,2427)
 LexToken(VAR,'in',1,2428)
 LexToken(ASSIGNMENT,'=',1,2430)
-LexToken(NUMBER,'-1',1,2431)
+LexToken(ADDITION,'-',1,2431)
+LexToken(NUMBER,'1',1,2432)
 LexToken(EOL,'\n',1,2433)
 LexToken(VAR,'model',1,2442)
 LexToken(DOT,'.',1,2447)
 LexToken(VAR,'in2',1,2448)
 LexToken(ASSIGNMENT,'=',1,2451)
-LexToken(NUMBER,'-2',1,2452)
+LexToken(ADDITION,'-',1,2452)
+LexToken(NUMBER,'2',1,2453)
 LexToken(EOL,'\n',1,2454)
 LexToken(VAR,'model',1,2463)
 LexToken(DOT,'.',1,2468)
diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js
index d7e742ca..85cb960e 100644
--- a/js/Sinks/CMSCOPE.js
+++ b/js/Sinks/CMSCOPE.js
@@ -154,11 +154,13 @@ LexToken(VAR,'list',1,1657)
 LexToken(OPENBRACKET,'(',1,1661)
 LexToken(DQSTRING,'"vec"',1,1666)
 LexToken(COMMA,',',1,1667)
-LexToken(NUMBER,'-1',1,1668)
+LexToken(ADDITION,'-',1,1668)
+LexToken(NUMBER,'1',1,1669)
 LexToken(COMMA,',',1,1670)
 LexToken(DQSTRING,'"vec"',1,1675)
 LexToken(COMMA,',',1,1676)
-LexToken(NUMBER,'-1',1,1677)
+LexToken(ADDITION,'-',1,1677)
+LexToken(NUMBER,'1',1,1678)
 LexToken(COMMA,',',1,1679)
 LexToken(DQSTRING,'"vec"',1,1684)
 LexToken(COMMA,',',1,1685)
@@ -166,11 +168,13 @@ LexToken(NUMBER,'1',1,1686)
 LexToken(COMMA,',',1,1687)
 LexToken(DQSTRING,'"vec"',1,1692)
 LexToken(COMMA,',',1,1693)
-LexToken(NUMBER,'-1',1,1694)
+LexToken(ADDITION,'-',1,1694)
+LexToken(NUMBER,'1',1,1695)
 LexToken(COMMA,',',1,1696)
 LexToken(DQSTRING,'"vec"',1,1701)
 LexToken(COMMA,',',1,1702)
-LexToken(NUMBER,'-1',1,1703)
+LexToken(ADDITION,'-',1,1703)
+LexToken(NUMBER,'1',1,1704)
 LexToken(COMMA,',',1,1705)
 LexToken(DQSTRING,'"vec"',1,1725)
 LexToken(COMMA,',',1,1726)
@@ -287,7 +291,7 @@ LexToken(OPENSQBRACKET,'[',1,2290)
 LexToken(VAR,'mess',1,2291)
 LexToken(SEMICOLON,';',1,2295)
 LexToken(DQSTRING,'"Not enough colors defined (at least "',1,2333)
-LexToken(OPERATOR,'+',1,2334)
+LexToken(ADDITION,'+',1,2334)
 LexToken(VAR,'string',1,2335)
 LexToken(OPENBRACKET,'(',1,2341)
 LexToken(VAR,'sum',1,2342)
@@ -295,7 +299,7 @@ LexToken(OPENBRACKET,'(',1,2345)
 LexToken(VAR,'in',1,2346)
 LexToken(CLOSEBRACKET,')',1,2348)
 LexToken(CLOSEBRACKET,')',1,2349)
-LexToken(OPERATOR,'+',1,2350)
+LexToken(ADDITION,'+',1,2350)
 LexToken(DQSTRING,'")"',1,2353)
 LexToken(SEMICOLON,';',1,2354)
 LexToken(DQSTRING,'" "',1,2357)
@@ -382,7 +386,8 @@ LexToken(EOL,'\n',1,2732)
 LexToken(IF,'if',1,2745)
 LexToken(VAR,'win',1,2748)
 LexToken(COMPARISON,'<',1,2751)
-LexToken(NUMBER,'-1',1,2752)
+LexToken(ADDITION,'-',1,2752)
+LexToken(NUMBER,'1',1,2753)
 LexToken(THEN,'then',1,2755)
 LexToken(EOL,'\n',1,2759)
 LexToken(VAR,'mess',1,2776)
@@ -638,7 +643,7 @@ LexToken(COMMA,',',1,4003)
 LexToken(VAR,'ones',1,4004)
 LexToken(OPENBRACKET,'(',1,4008)
 LexToken(NUMBER,'1',1,4009)
-LexToken(OPERATOR,'-',1,4010)
+LexToken(ADDITION,'-',1,4010)
 LexToken(VAR,'heritance',1,4011)
 LexToken(COMMA,',',1,4020)
 LexToken(NUMBER,'1',1,4021)
@@ -665,9 +670,11 @@ LexToken(EOL,'\n',1,4100)
 LexToken(VAR,'wpos',1,4121)
 LexToken(ASSIGNMENT,'=',1,4125)
 LexToken(OPENSQBRACKET,'[',1,4126)
-LexToken(NUMBER,'-1',1,4127)
+LexToken(ADDITION,'-',1,4127)
+LexToken(NUMBER,'1',1,4128)
 LexToken(SEMICOLON,';',1,4129)
-LexToken(NUMBER,'-1',1,4130)
+LexToken(ADDITION,'-',1,4130)
+LexToken(NUMBER,'1',1,4131)
 LexToken(CLOSESQBRACKET,']',1,4132)
 LexToken(SEMICOLON,';',1,4133)
 LexToken(EOL,'\n',1,4134)
@@ -683,9 +690,11 @@ LexToken(EOL,'\n',1,4187)
 LexToken(VAR,'wdim',1,4208)
 LexToken(ASSIGNMENT,'=',1,4212)
 LexToken(OPENSQBRACKET,'[',1,4213)
-LexToken(NUMBER,'-1',1,4214)
+LexToken(ADDITION,'-',1,4214)
+LexToken(NUMBER,'1',1,4215)
 LexToken(SEMICOLON,';',1,4216)
-LexToken(NUMBER,'-1',1,4217)
+LexToken(ADDITION,'-',1,4217)
+LexToken(NUMBER,'1',1,4218)
 LexToken(CLOSESQBRACKET,']',1,4219)
 LexToken(SEMICOLON,';',1,4220)
 LexToken(EOL,'\n',1,4221)
@@ -795,7 +804,7 @@ LexToken(ASSIGNMENT,'=',1,4697)
 LexToken(VAR,'ones',1,4698)
 LexToken(OPENBRACKET,'(',1,4702)
 LexToken(NUMBER,'1',1,4703)
-LexToken(OPERATOR,'-',1,4704)
+LexToken(ADDITION,'-',1,4704)
 LexToken(VAR,'heritance',1,4705)
 LexToken(COMMA,',',1,4714)
 LexToken(NUMBER,'1',1,4715)
@@ -871,7 +880,8 @@ LexToken(THEN,'then',1,5182)
 LexToken(EOL,'\n',1,5186)
 LexToken(VAR,'win',1,5195)
 LexToken(ASSIGNMENT,'=',1,5198)
-LexToken(NUMBER,'-1',1,5199)
+LexToken(ADDITION,'-',1,5199)
+LexToken(NUMBER,'1',1,5200)
 LexToken(SEMICOLON,';',1,5201)
 LexToken(EOL,'\n',1,5202)
 LexToken(VAR,'in',1,5211)
@@ -885,17 +895,21 @@ LexToken(EOL,'\n',1,5219)
 LexToken(VAR,'wdim',1,5228)
 LexToken(ASSIGNMENT,'=',1,5232)
 LexToken(OPENSQBRACKET,'[',1,5233)
-LexToken(NUMBER,'-1',1,5234)
+LexToken(ADDITION,'-',1,5234)
+LexToken(NUMBER,'1',1,5235)
 LexToken(SEMICOLON,';',1,5236)
-LexToken(NUMBER,'-1',1,5237)
+LexToken(ADDITION,'-',1,5237)
+LexToken(NUMBER,'1',1,5238)
 LexToken(CLOSESQBRACKET,']',1,5239)
 LexToken(EOL,'\n',1,5240)
 LexToken(VAR,'wpos',1,5249)
 LexToken(ASSIGNMENT,'=',1,5253)
 LexToken(OPENSQBRACKET,'[',1,5254)
-LexToken(NUMBER,'-1',1,5255)
+LexToken(ADDITION,'-',1,5255)
+LexToken(NUMBER,'1',1,5256)
 LexToken(SEMICOLON,';',1,5257)
-LexToken(NUMBER,'-1',1,5258)
+LexToken(ADDITION,'-',1,5258)
+LexToken(NUMBER,'1',1,5259)
 LexToken(CLOSESQBRACKET,']',1,5260)
 LexToken(EOL,'\n',1,5261)
 LexToken(VAR,'clrs',1,5270)
@@ -928,9 +942,11 @@ LexToken(EOL,'\n',1,5311)
 LexToken(VAR,'ymin',1,5320)
 LexToken(ASSIGNMENT,'=',1,5324)
 LexToken(OPENSQBRACKET,'[',1,5325)
-LexToken(NUMBER,'-1',1,5326)
+LexToken(ADDITION,'-',1,5326)
+LexToken(NUMBER,'1',1,5327)
 LexToken(SEMICOLON,';',1,5328)
-LexToken(NUMBER,'-5',1,5329)
+LexToken(ADDITION,'-',1,5329)
+LexToken(NUMBER,'5',1,5330)
 LexToken(CLOSESQBRACKET,']',1,5331)
 LexToken(SEMICOLON,';',1,5332)
 LexToken(EOL,'\n',1,5333)
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index b74db6ca..ccf93a4e 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -155,11 +155,13 @@ LexToken(NUMBER,'1',1,1617)
 LexToken(COMMA,',',1,1618)
 LexToken(DQSTRING,'"vec"',1,1623)
 LexToken(COMMA,',',1,1624)
-LexToken(NUMBER,'-1',1,1625)
+LexToken(ADDITION,'-',1,1625)
+LexToken(NUMBER,'1',1,1626)
 LexToken(COMMA,',',1,1627)
 LexToken(DQSTRING,'"vec"',1,1632)
 LexToken(COMMA,',',1,1633)
-LexToken(NUMBER,'-1',1,1634)
+LexToken(ADDITION,'-',1,1634)
+LexToken(NUMBER,'1',1,1635)
 LexToken(COMMA,',',1,1636)
 LexToken(DQSTRING,'"vec"',1,1641)
 LexToken(COMMA,',',1,1642)
@@ -279,7 +281,8 @@ LexToken(EOL,'\n',1,2167)
 LexToken(IF,'if',1,2180)
 LexToken(VAR,'win',1,2183)
 LexToken(COMPARISON,'<',1,2186)
-LexToken(NUMBER,'-1',1,2187)
+LexToken(ADDITION,'-',1,2187)
+LexToken(NUMBER,'1',1,2188)
 LexToken(THEN,'then',1,2190)
 LexToken(EOL,'\n',1,2194)
 LexToken(VAR,'mess',1,2211)
@@ -432,7 +435,8 @@ LexToken(COMMA,',',1,3055)
 LexToken(VAR,'list',1,3056)
 LexToken(OPENBRACKET,'(',1,3060)
 LexToken(OPENSQBRACKET,'[',1,3061)
-LexToken(NUMBER,'-1',1,3062)
+LexToken(ADDITION,'-',1,3062)
+LexToken(NUMBER,'1',1,3063)
 LexToken(NUMBER,'1',1,3065)
 LexToken(CLOSESQBRACKET,']',1,3066)
 LexToken(COMMA,',',1,3067)
@@ -446,7 +450,7 @@ LexToken(COMMA,',',1,3077)
 LexToken(VAR,'ones',1,3078)
 LexToken(OPENBRACKET,'(',1,3082)
 LexToken(NUMBER,'1',1,3083)
-LexToken(OPERATOR,'-',1,3084)
+LexToken(ADDITION,'-',1,3084)
 LexToken(VAR,'heritance',1,3085)
 LexToken(COMMA,',',1,3094)
 LexToken(NUMBER,'1',1,3095)
@@ -473,9 +477,11 @@ LexToken(EOL,'\n',1,3174)
 LexToken(VAR,'wpos',1,3195)
 LexToken(ASSIGNMENT,'=',1,3199)
 LexToken(OPENSQBRACKET,'[',1,3200)
-LexToken(NUMBER,'-1',1,3201)
+LexToken(ADDITION,'-',1,3201)
+LexToken(NUMBER,'1',1,3202)
 LexToken(SEMICOLON,';',1,3203)
-LexToken(NUMBER,'-1',1,3204)
+LexToken(ADDITION,'-',1,3204)
+LexToken(NUMBER,'1',1,3205)
 LexToken(CLOSESQBRACKET,']',1,3206)
 LexToken(SEMICOLON,';',1,3207)
 LexToken(EOL,'\n',1,3208)
@@ -491,9 +497,11 @@ LexToken(EOL,'\n',1,3261)
 LexToken(VAR,'wdim',1,3282)
 LexToken(ASSIGNMENT,'=',1,3286)
 LexToken(OPENSQBRACKET,'[',1,3287)
-LexToken(NUMBER,'-1',1,3288)
+LexToken(ADDITION,'-',1,3288)
+LexToken(NUMBER,'1',1,3289)
 LexToken(SEMICOLON,';',1,3290)
-LexToken(NUMBER,'-1',1,3291)
+LexToken(ADDITION,'-',1,3291)
+LexToken(NUMBER,'1',1,3292)
 LexToken(CLOSESQBRACKET,']',1,3293)
 LexToken(SEMICOLON,';',1,3294)
 LexToken(EOL,'\n',1,3295)
@@ -558,7 +566,7 @@ LexToken(ASSIGNMENT,'=',1,3622)
 LexToken(VAR,'ones',1,3623)
 LexToken(OPENBRACKET,'(',1,3627)
 LexToken(NUMBER,'1',1,3628)
-LexToken(OPERATOR,'-',1,3629)
+LexToken(ADDITION,'-',1,3629)
 LexToken(VAR,'heritance',1,3630)
 LexToken(COMMA,',',1,3639)
 LexToken(NUMBER,'1',1,3640)
@@ -609,7 +617,8 @@ LexToken(THEN,'then',1,3881)
 LexToken(EOL,'\n',1,3885)
 LexToken(VAR,'win',1,3894)
 LexToken(ASSIGNMENT,'=',1,3897)
-LexToken(NUMBER,'-1',1,3898)
+LexToken(ADDITION,'-',1,3898)
+LexToken(NUMBER,'1',1,3899)
 LexToken(SEMICOLON,';',1,3900)
 LexToken(EOL,'\n',1,3901)
 LexToken(VAR,'wdim',1,3910)
@@ -623,9 +632,11 @@ LexToken(EOL,'\n',1,3924)
 LexToken(VAR,'wpos',1,3933)
 LexToken(ASSIGNMENT,'=',1,3937)
 LexToken(OPENSQBRACKET,'[',1,3938)
-LexToken(NUMBER,'-1',1,3939)
+LexToken(ADDITION,'-',1,3939)
+LexToken(NUMBER,'1',1,3940)
 LexToken(SEMICOLON,';',1,3941)
-LexToken(NUMBER,'-1',1,3942)
+LexToken(ADDITION,'-',1,3942)
+LexToken(NUMBER,'1',1,3943)
 LexToken(CLOSESQBRACKET,']',1,3944)
 LexToken(EOL,'\n',1,3945)
 LexToken(VAR,'clrs',1,3954)
@@ -656,12 +667,13 @@ LexToken(SEMICOLON,';',1,3993)
 LexToken(EOL,'\n',1,3994)
 LexToken(VAR,'ymin',1,4003)
 LexToken(ASSIGNMENT,'=',1,4007)
-LexToken(NUMBER,'-15',1,4008)
+LexToken(ADDITION,'-',1,4008)
+LexToken(NUMBER,'15',1,4009)
 LexToken(SEMICOLON,';',1,4011)
 LexToken(EOL,'\n',1,4012)
 LexToken(VAR,'ymax',1,4021)
 LexToken(ASSIGNMENT,'=',1,4025)
-LexToken(OPERATOR,'+',1,4026)
+LexToken(ADDITION,'+',1,4026)
 LexToken(NUMBER,'15',1,4027)
 LexToken(SEMICOLON,';',1,4029)
 LexToken(EOL,'\n',1,4030)
@@ -692,7 +704,8 @@ LexToken(VAR,'model',1,4120)
 LexToken(DOT,'.',1,4125)
 LexToken(VAR,'in',1,4126)
 LexToken(ASSIGNMENT,'=',1,4128)
-LexToken(NUMBER,'-1',1,4129)
+LexToken(ADDITION,'-',1,4129)
+LexToken(NUMBER,'1',1,4130)
 LexToken(EOL,'\n',1,4131)
 LexToken(VAR,'model',1,4140)
 LexToken(DOT,'.',1,4145)
diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js
index b03939f1..2a83addf 100644
--- a/js/Sinks/CSCOPXY.js
+++ b/js/Sinks/CSCOPXY.js
@@ -168,11 +168,13 @@ LexToken(NUMBER,'1',1,1622)
 LexToken(COMMA,',',1,1623)
 LexToken(DQSTRING,'"vec"',1,1628)
 LexToken(COMMA,',',1,1629)
-LexToken(NUMBER,'-1',1,1630)
+LexToken(ADDITION,'-',1,1630)
+LexToken(NUMBER,'1',1,1631)
 LexToken(COMMA,',',1,1632)
 LexToken(DQSTRING,'"vec"',1,1637)
 LexToken(COMMA,',',1,1638)
-LexToken(NUMBER,'-1',1,1639)
+LexToken(ADDITION,'-',1,1639)
+LexToken(NUMBER,'1',1,1640)
 LexToken(COMMA,',',1,1641)
 LexToken(DQSTRING,'"vec"',1,1646)
 LexToken(COMMA,',',1,1647)
@@ -312,7 +314,8 @@ LexToken(EOL,'\n',1,2301)
 LexToken(IF,'if',1,2314)
 LexToken(VAR,'win',1,2317)
 LexToken(COMPARISON,'<',1,2320)
-LexToken(NUMBER,'-1',1,2321)
+LexToken(ADDITION,'-',1,2321)
+LexToken(NUMBER,'1',1,2322)
 LexToken(THEN,'then',1,2324)
 LexToken(EOL,'\n',1,2328)
 LexToken(VAR,'mess',1,2345)
@@ -438,7 +441,7 @@ LexToken(EOL,'\n',1,3044)
 LexToken(VAR,'in',1,3061)
 LexToken(ASSIGNMENT,'=',1,3064)
 LexToken(VAR,'nbr_curves',1,3066)
-LexToken(OPERATOR,'*',1,3076)
+LexToken(MULTIPLICATION,'*',1,3076)
 LexToken(VAR,'ones',1,3077)
 LexToken(OPENBRACKET,'(',1,3081)
 LexToken(NUMBER,'2',1,3082)
@@ -512,9 +515,11 @@ LexToken(EOL,'\n',1,3258)
 LexToken(VAR,'wpos',1,3279)
 LexToken(ASSIGNMENT,'=',1,3283)
 LexToken(OPENSQBRACKET,'[',1,3284)
-LexToken(NUMBER,'-1',1,3285)
+LexToken(ADDITION,'-',1,3285)
+LexToken(NUMBER,'1',1,3286)
 LexToken(SEMICOLON,';',1,3287)
-LexToken(NUMBER,'-1',1,3288)
+LexToken(ADDITION,'-',1,3288)
+LexToken(NUMBER,'1',1,3289)
 LexToken(CLOSESQBRACKET,']',1,3290)
 LexToken(SEMICOLON,';',1,3291)
 LexToken(EOL,'\n',1,3292)
@@ -530,9 +535,11 @@ LexToken(EOL,'\n',1,3345)
 LexToken(VAR,'wdim',1,3366)
 LexToken(ASSIGNMENT,'=',1,3370)
 LexToken(OPENSQBRACKET,'[',1,3371)
-LexToken(NUMBER,'-1',1,3372)
+LexToken(ADDITION,'-',1,3372)
+LexToken(NUMBER,'1',1,3373)
 LexToken(SEMICOLON,';',1,3374)
-LexToken(NUMBER,'-1',1,3375)
+LexToken(ADDITION,'-',1,3375)
+LexToken(NUMBER,'1',1,3376)
 LexToken(CLOSESQBRACKET,']',1,3377)
 LexToken(SEMICOLON,';',1,3378)
 LexToken(EOL,'\n',1,3379)
@@ -625,7 +632,8 @@ LexToken(THEN,'then',1,3866)
 LexToken(EOL,'\n',1,3870)
 LexToken(VAR,'win',1,3879)
 LexToken(ASSIGNMENT,'=',1,3882)
-LexToken(NUMBER,'-1',1,3883)
+LexToken(ADDITION,'-',1,3883)
+LexToken(NUMBER,'1',1,3884)
 LexToken(SEMICOLON,';',1,3885)
 LexToken(EOL,'\n',1,3886)
 LexToken(VAR,'clrs',1,3895)
@@ -647,9 +655,11 @@ LexToken(EOL,'\n',1,3930)
 LexToken(VAR,'wpos',1,3939)
 LexToken(ASSIGNMENT,'=',1,3943)
 LexToken(OPENSQBRACKET,'[',1,3944)
-LexToken(NUMBER,'-1',1,3945)
+LexToken(ADDITION,'-',1,3945)
+LexToken(NUMBER,'1',1,3946)
 LexToken(SEMICOLON,';',1,3947)
-LexToken(NUMBER,'-1',1,3948)
+LexToken(ADDITION,'-',1,3948)
+LexToken(NUMBER,'1',1,3949)
 LexToken(CLOSESQBRACKET,']',1,3950)
 LexToken(EOL,'\n',1,3951)
 LexToken(VAR,'N',1,3960)
@@ -659,7 +669,8 @@ LexToken(SEMICOLON,';',1,3963)
 LexToken(EOL,'\n',1,3964)
 LexToken(VAR,'xmin',1,3973)
 LexToken(ASSIGNMENT,'=',1,3977)
-LexToken(NUMBER,'-15',1,3978)
+LexToken(ADDITION,'-',1,3978)
+LexToken(NUMBER,'15',1,3979)
 LexToken(SEMICOLON,';',1,3981)
 LexToken(EOL,'\n',1,3982)
 LexToken(VAR,'xmax',1,3991)
@@ -669,12 +680,13 @@ LexToken(SEMICOLON,';',1,3998)
 LexToken(EOL,'\n',1,3999)
 LexToken(VAR,'ymin',1,4008)
 LexToken(ASSIGNMENT,'=',1,4012)
-LexToken(NUMBER,'-15',1,4013)
+LexToken(ADDITION,'-',1,4013)
+LexToken(NUMBER,'15',1,4014)
 LexToken(SEMICOLON,';',1,4016)
 LexToken(EOL,'\n',1,4017)
 LexToken(VAR,'ymax',1,4026)
 LexToken(ASSIGNMENT,'=',1,4030)
-LexToken(OPERATOR,'+',1,4031)
+LexToken(ADDITION,'+',1,4031)
 LexToken(NUMBER,'15',1,4032)
 LexToken(EOL,'\n',1,4034)
 LexToken(VAR,'nbr_curves',1,4043)
diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js
index 629f8b77..c914e466 100644
--- a/js/Sinks/CSCOPXY3D.js
+++ b/js/Sinks/CSCOPXY3D.js
@@ -155,11 +155,13 @@ LexToken(NUMBER,'1',1,1614)
 LexToken(COMMA,',',1,1615)
 LexToken(DQSTRING,'"vec"',1,1620)
 LexToken(COMMA,',',1,1621)
-LexToken(NUMBER,'-1',1,1622)
+LexToken(ADDITION,'-',1,1622)
+LexToken(NUMBER,'1',1,1623)
 LexToken(COMMA,',',1,1624)
 LexToken(DQSTRING,'"vec"',1,1629)
 LexToken(COMMA,',',1,1630)
-LexToken(NUMBER,'-1',1,1631)
+LexToken(ADDITION,'-',1,1631)
+LexToken(NUMBER,'1',1,1632)
 LexToken(COMMA,',',1,1633)
 LexToken(DQSTRING,'"vec"',1,1638)
 LexToken(COMMA,',',1,1639)
@@ -167,11 +169,13 @@ LexToken(NUMBER,'1',1,1640)
 LexToken(COMMA,',',1,1641)
 LexToken(DQSTRING,'"vec"',1,1646)
 LexToken(COMMA,',',1,1647)
-LexToken(NUMBER,'-1',1,1648)
+LexToken(ADDITION,'-',1,1648)
+LexToken(NUMBER,'1',1,1649)
 LexToken(COMMA,',',1,1650)
 LexToken(DQSTRING,'"vec"',1,1655)
 LexToken(COMMA,',',1,1656)
-LexToken(NUMBER,'-1',1,1657)
+LexToken(ADDITION,'-',1,1657)
+LexToken(NUMBER,'1',1,1658)
 LexToken(COMMA,',',1,1659)
 LexToken(DQSTRING,'"vec"',1,1664)
 LexToken(COMMA,',',1,1665)
@@ -342,7 +346,8 @@ LexToken(EOL,'\n',1,2476)
 LexToken(IF,'if',1,2489)
 LexToken(VAR,'win',1,2492)
 LexToken(COMPARISON,'<',1,2495)
-LexToken(NUMBER,'-1',1,2496)
+LexToken(ADDITION,'-',1,2496)
+LexToken(NUMBER,'1',1,2497)
 LexToken(THEN,'then',1,2499)
 LexToken(EOL,'\n',1,2503)
 LexToken(VAR,'mess',1,2520)
@@ -520,7 +525,7 @@ LexToken(EOL,'\n',1,3479)
 LexToken(VAR,'in',1,3496)
 LexToken(ASSIGNMENT,'=',1,3499)
 LexToken(VAR,'nbr_curves',1,3501)
-LexToken(OPERATOR,'*',1,3511)
+LexToken(MULTIPLICATION,'*',1,3511)
 LexToken(VAR,'ones',1,3512)
 LexToken(OPENBRACKET,'(',1,3516)
 LexToken(NUMBER,'3',1,3517)
@@ -594,9 +599,11 @@ LexToken(EOL,'\n',1,3693)
 LexToken(VAR,'wpos',1,3714)
 LexToken(ASSIGNMENT,'=',1,3718)
 LexToken(OPENSQBRACKET,'[',1,3719)
-LexToken(NUMBER,'-1',1,3720)
+LexToken(ADDITION,'-',1,3720)
+LexToken(NUMBER,'1',1,3721)
 LexToken(SEMICOLON,';',1,3722)
-LexToken(NUMBER,'-1',1,3723)
+LexToken(ADDITION,'-',1,3723)
+LexToken(NUMBER,'1',1,3724)
 LexToken(CLOSESQBRACKET,']',1,3725)
 LexToken(SEMICOLON,';',1,3726)
 LexToken(EOL,'\n',1,3727)
@@ -612,9 +619,11 @@ LexToken(EOL,'\n',1,3780)
 LexToken(VAR,'wdim',1,3801)
 LexToken(ASSIGNMENT,'=',1,3805)
 LexToken(OPENSQBRACKET,'[',1,3806)
-LexToken(NUMBER,'-1',1,3807)
+LexToken(ADDITION,'-',1,3807)
+LexToken(NUMBER,'1',1,3808)
 LexToken(SEMICOLON,';',1,3809)
-LexToken(NUMBER,'-1',1,3810)
+LexToken(ADDITION,'-',1,3810)
+LexToken(NUMBER,'1',1,3811)
 LexToken(CLOSESQBRACKET,']',1,3812)
 LexToken(SEMICOLON,';',1,3813)
 LexToken(EOL,'\n',1,3814)
@@ -741,7 +750,8 @@ LexToken(THEN,'then',1,4307)
 LexToken(EOL,'\n',1,4311)
 LexToken(VAR,'win',1,4320)
 LexToken(ASSIGNMENT,'=',1,4324)
-LexToken(NUMBER,'-1',1,4326)
+LexToken(ADDITION,'-',1,4326)
+LexToken(NUMBER,'1',1,4327)
 LexToken(SEMICOLON,';',1,4328)
 LexToken(EOL,'\n',1,4329)
 LexToken(VAR,'clrs',1,4338)
@@ -795,9 +805,11 @@ LexToken(EOL,'\n',1,4420)
 LexToken(VAR,'wpos',1,4429)
 LexToken(ASSIGNMENT,'=',1,4434)
 LexToken(OPENSQBRACKET,'[',1,4436)
-LexToken(NUMBER,'-1',1,4437)
+LexToken(ADDITION,'-',1,4437)
+LexToken(NUMBER,'1',1,4438)
 LexToken(SEMICOLON,';',1,4439)
-LexToken(NUMBER,'-1',1,4440)
+LexToken(ADDITION,'-',1,4440)
+LexToken(NUMBER,'1',1,4441)
 LexToken(CLOSESQBRACKET,']',1,4442)
 LexToken(EOL,'\n',1,4443)
 LexToken(VAR,'N',1,4452)
@@ -816,7 +828,8 @@ LexToken(EOL,'\n',1,4482)
 LexToken(VAR,'vec_x',1,4491)
 LexToken(ASSIGNMENT,'=',1,4497)
 LexToken(OPENSQBRACKET,'[',1,4499)
-LexToken(NUMBER,'-15',1,4500)
+LexToken(ADDITION,'-',1,4500)
+LexToken(NUMBER,'15',1,4501)
 LexToken(SEMICOLON,';',1,4503)
 LexToken(NUMBER,'15',1,4504)
 LexToken(CLOSESQBRACKET,']',1,4506)
@@ -824,7 +837,8 @@ LexToken(EOL,'\n',1,4507)
 LexToken(VAR,'vec_y',1,4516)
 LexToken(ASSIGNMENT,'=',1,4522)
 LexToken(OPENSQBRACKET,'[',1,4524)
-LexToken(NUMBER,'-15',1,4525)
+LexToken(ADDITION,'-',1,4525)
+LexToken(NUMBER,'15',1,4526)
 LexToken(SEMICOLON,';',1,4528)
 LexToken(NUMBER,'15',1,4529)
 LexToken(CLOSESQBRACKET,']',1,4531)
@@ -832,7 +846,8 @@ LexToken(EOL,'\n',1,4532)
 LexToken(VAR,'vec_z',1,4541)
 LexToken(ASSIGNMENT,'=',1,4547)
 LexToken(OPENSQBRACKET,'[',1,4549)
-LexToken(NUMBER,'-15',1,4550)
+LexToken(ADDITION,'-',1,4550)
+LexToken(NUMBER,'15',1,4551)
 LexToken(SEMICOLON,';',1,4553)
 LexToken(NUMBER,'15',1,4554)
 LexToken(CLOSESQBRACKET,']',1,4556)
diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js
index acf12de8..0a92fb44 100644
--- a/js/Sinks/OUTIMPL_f.js
+++ b/js/Sinks/OUTIMPL_f.js
@@ -266,7 +266,8 @@ LexToken(DOT,'.',1,2123)
 LexToken(VAR,'in',1,2124)
 LexToken(ASSIGNMENT,'=',1,2126)
 LexToken(OPENSQBRACKET,'[',1,2127)
-LexToken(NUMBER,'-1',1,2128)
+LexToken(ADDITION,'-',1,2128)
+LexToken(NUMBER,'1',1,2129)
 LexToken(CLOSESQBRACKET,']',1,2130)
 LexToken(EOL,'\n',1,2131)
 LexToken(VAR,'model',1,2140)
diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js
index 406ce194..8ddc26d2 100644
--- a/js/Sinks/OUT_f.js
+++ b/js/Sinks/OUT_f.js
@@ -239,7 +239,8 @@ LexToken(THEN,'then',1,1937)
 LexToken(EOL,'\n',1,1941)
 LexToken(VAR,'n',1,1950)
 LexToken(ASSIGNMENT,'=',1,1951)
-LexToken(NUMBER,'-1',1,1952)
+LexToken(ADDITION,'-',1,1952)
+LexToken(NUMBER,'1',1,1953)
 LexToken(EOL,'\n',1,1954)
 LexToken(VAR,'prt',1,1963)
 LexToken(ASSIGNMENT,'=',1,1966)
@@ -261,19 +262,22 @@ LexToken(VAR,'model',1,2033)
 LexToken(DOT,'.',1,2038)
 LexToken(VAR,'in',1,2039)
 LexToken(ASSIGNMENT,'=',1,2041)
-LexToken(NUMBER,'-1',1,2042)
+LexToken(ADDITION,'-',1,2042)
+LexToken(NUMBER,'1',1,2043)
 LexToken(EOL,'\n',1,2044)
 LexToken(VAR,'model',1,2053)
 LexToken(DOT,'.',1,2058)
 LexToken(VAR,'in2',1,2059)
 LexToken(ASSIGNMENT,'=',1,2062)
-LexToken(NUMBER,'-2',1,2063)
+LexToken(ADDITION,'-',1,2063)
+LexToken(NUMBER,'2',1,2064)
 LexToken(EOL,'\n',1,2065)
 LexToken(VAR,'model',1,2074)
 LexToken(DOT,'.',1,2079)
 LexToken(VAR,'intyp',1,2080)
 LexToken(ASSIGNMENT,'=',1,2085)
-LexToken(NUMBER,'-1',1,2086)
+LexToken(ADDITION,'-',1,2086)
+LexToken(NUMBER,'1',1,2087)
 LexToken(EOL,'\n',1,2088)
 LexToken(VAR,'model',1,2097)
 LexToken(DOT,'.',1,2102)
diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js
index 84fd1d28..9ff066b1 100644
--- a/js/Sinks/TOWS_c.js
+++ b/js/Sinks/TOWS_c.js
@@ -225,19 +225,19 @@ LexToken(EOL,'\n',1,2092)
 LexToken(VAR,'execstr',1,2105)
 LexToken(OPENBRACKET,'(',1,2112)
 LexToken(DQSTRING,'"if type("',1,2122)
-LexToken(OPERATOR,'+',1,2123)
+LexToken(ADDITION,'+',1,2123)
 LexToken(VAR,'varnam',1,2124)
-LexToken(OPERATOR,'+',1,2130)
+LexToken(ADDITION,'+',1,2130)
 LexToken(DQSTRING,'") <> 17 | or(fieldnames("',1,2156)
-LexToken(OPERATOR,'+',1,2157)
+LexToken(ADDITION,'+',1,2157)
 LexToken(VAR,'varnam',1,2158)
-LexToken(OPERATOR,'+',1,2164)
+LexToken(ADDITION,'+',1,2164)
 LexToken(DQSTRING,'") <> [\\"values\\"; \\"time\\"]) then"',1,2199)
-LexToken(OPERATOR,'+',1,2201)
+LexToken(ADDITION,'+',1,2201)
 LexToken(DQSTRING,'" message([\\"Protected variable name.\\"; \\"Please choose another variable name.\\"]);"',1,2303)
-LexToken(OPERATOR,'+',1,2305)
+LexToken(ADDITION,'+',1,2305)
 LexToken(DQSTRING,'" ok = %f;"',1,2333)
-LexToken(OPERATOR,'+',1,2335)
+LexToken(ADDITION,'+',1,2335)
 LexToken(DQSTRING,'" end"',1,2358)
 LexToken(COMMA,',',1,2359)
 LexToken(DQSTRING,'"errcatch"',1,2370)
@@ -266,12 +266,15 @@ LexToken(COMMA,',',1,2460)
 LexToken(VAR,'list',1,2482)
 LexToken(OPENBRACKET,'(',1,2486)
 LexToken(OPENSQBRACKET,'[',1,2487)
-LexToken(NUMBER,'-1',1,2488)
+LexToken(ADDITION,'-',1,2488)
+LexToken(NUMBER,'1',1,2489)
 LexToken(COMMA,',',1,2490)
-LexToken(NUMBER,'-2',1,2492)
+LexToken(ADDITION,'-',1,2492)
+LexToken(NUMBER,'2',1,2493)
 LexToken(CLOSESQBRACKET,']',1,2494)
 LexToken(COMMA,',',1,2495)
-LexToken(NUMBER,'-1',1,2497)
+LexToken(ADDITION,'-',1,2497)
+LexToken(NUMBER,'1',1,2498)
 LexToken(CLOSEBRACKET,')',1,2499)
 LexToken(COMMA,',',1,2500)
 LexToken(VAR,'list',1,2502)
@@ -281,7 +284,7 @@ LexToken(COMMA,',',1,2508)
 LexToken(VAR,'ones',1,2530)
 LexToken(OPENBRACKET,'(',1,2534)
 LexToken(NUMBER,'1',1,2535)
-LexToken(OPERATOR,'-',1,2536)
+LexToken(ADDITION,'-',1,2536)
 LexToken(VAR,'herit',1,2537)
 LexToken(COMMA,',',1,2542)
 LexToken(NUMBER,'1',1,2544)
@@ -370,7 +373,8 @@ LexToken(THEN,'then',1,2963)
 LexToken(EOL,'\n',1,2967)
 LexToken(VAR,'nu',1,2976)
 LexToken(ASSIGNMENT,'=',1,2983)
-LexToken(NUMBER,'-1',1,2985)
+LexToken(ADDITION,'-',1,2985)
+LexToken(NUMBER,'1',1,2986)
 LexToken(SEMICOLON,';',1,2987)
 LexToken(EOL,'\n',1,2988)
 LexToken(VAR,'nz',1,2997)
@@ -421,14 +425,16 @@ LexToken(VAR,'model',1,3181)
 LexToken(DOT,'.',1,3186)
 LexToken(VAR,'in2',1,3187)
 LexToken(ASSIGNMENT,'=',1,3197)
-LexToken(NUMBER,'-2',1,3199)
+LexToken(ADDITION,'-',1,3199)
+LexToken(NUMBER,'2',1,3200)
 LexToken(SEMICOLON,';',1,3201)
 LexToken(EOL,'\n',1,3202)
 LexToken(VAR,'model',1,3211)
 LexToken(DOT,'.',1,3216)
 LexToken(VAR,'intyp',1,3217)
 LexToken(ASSIGNMENT,'=',1,3227)
-LexToken(NUMBER,'-1',1,3229)
+LexToken(ADDITION,'-',1,3229)
+LexToken(NUMBER,'1',1,3230)
 LexToken(SEMICOLON,';',1,3231)
 LexToken(EOL,'\n',1,3232)
 LexToken(VAR,'model',1,3241)
diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js
index 79ecb189..7b30eb35 100644
--- a/js/Sinks/TRASH_f.js
+++ b/js/Sinks/TRASH_f.js
@@ -73,7 +73,8 @@ LexToken(THEN,'then',1,976)
 LexToken(EOL,'\n',1,980)
 LexToken(VAR,'in',1,989)
 LexToken(ASSIGNMENT,'=',1,991)
-LexToken(NUMBER,'-1',1,992)
+LexToken(ADDITION,'-',1,992)
+LexToken(NUMBER,'1',1,993)
 LexToken(EOL,'\n',1,994)
 LexToken(EOL,'\n',1,995)
 LexToken(VAR,'model',1,1004)
diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js
index 2d5b6614..4e9ea09a 100644
--- a/js/Sinks/WFILE_f.js
+++ b/js/Sinks/WFILE_f.js
@@ -650,19 +650,20 @@ LexToken(CLOSEBRACKET,')',1,4531)
 LexToken(COMPARISON,'<>',1,4532)
 LexToken(OPENBRACKET,'(',1,4534)
 LexToken(VAR,'nin',1,4535)
-LexToken(OPERATOR,'+',1,4538)
+LexToken(ADDITION,'+',1,4538)
 LexToken(NUMBER,'1',1,4539)
 LexToken(CLOSEBRACKET,')',1,4540)
-LexToken(OPERATOR,'*',1,4541)
+LexToken(MULTIPLICATION,'*',1,4541)
 LexToken(VAR,'N',1,4542)
-LexToken(OPERATOR,'+',1,4543)
+LexToken(ADDITION,'+',1,4543)
 LexToken(NUMBER,'2',1,4544)
 LexToken(THEN,'then',1,4546)
 LexToken(EOL,'\n',1,4550)
 LexToken(VAR,'dstate',1,4571)
 LexToken(ASSIGNMENT,'=',1,4577)
 LexToken(OPENSQBRACKET,'[',1,4578)
-LexToken(NUMBER,'-1',1,4579)
+LexToken(ADDITION,'-',1,4579)
+LexToken(NUMBER,'1',1,4580)
 LexToken(SEMICOLON,';',1,4581)
 LexToken(VAR,'lunit',1,4582)
 LexToken(SEMICOLON,';',1,4587)
@@ -670,10 +671,10 @@ LexToken(VAR,'zeros',1,4588)
 LexToken(OPENBRACKET,'(',1,4593)
 LexToken(OPENBRACKET,'(',1,4594)
 LexToken(VAR,'nin',1,4595)
-LexToken(OPERATOR,'+',1,4598)
+LexToken(ADDITION,'+',1,4598)
 LexToken(NUMBER,'1',1,4599)
 LexToken(CLOSEBRACKET,')',1,4600)
-LexToken(OPERATOR,'*',1,4601)
+LexToken(MULTIPLICATION,'*',1,4601)
 LexToken(VAR,'N',1,4602)
 LexToken(COMMA,',',1,4603)
 LexToken(NUMBER,'1',1,4604)
@@ -798,7 +799,8 @@ LexToken(DOT,'.',1,5164)
 LexToken(VAR,'dstate',1,5165)
 LexToken(ASSIGNMENT,'=',1,5171)
 LexToken(OPENSQBRACKET,'[',1,5172)
-LexToken(NUMBER,'-1',1,5173)
+LexToken(ADDITION,'-',1,5173)
+LexToken(NUMBER,'1',1,5174)
 LexToken(SEMICOLON,';',1,5175)
 LexToken(VAR,'lunit',1,5176)
 LexToken(SEMICOLON,';',1,5181)
@@ -806,10 +808,10 @@ LexToken(VAR,'zeros',1,5182)
 LexToken(OPENBRACKET,'(',1,5187)
 LexToken(OPENBRACKET,'(',1,5188)
 LexToken(VAR,'nin',1,5189)
-LexToken(OPERATOR,'+',1,5192)
+LexToken(ADDITION,'+',1,5192)
 LexToken(NUMBER,'1',1,5193)
 LexToken(CLOSEBRACKET,')',1,5194)
-LexToken(OPERATOR,'*',1,5195)
+LexToken(MULTIPLICATION,'*',1,5195)
 LexToken(VAR,'N',1,5196)
 LexToken(COMMA,',',1,5197)
 LexToken(NUMBER,'1',1,5198)
diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js
index 7260b1e7..62922425 100644
--- a/js/Sinks/WRITEAU_f.js
+++ b/js/Sinks/WRITEAU_f.js
@@ -353,19 +353,20 @@ LexToken(CLOSEBRACKET,')',1,2612)
 LexToken(COMPARISON,'<>',1,2613)
 LexToken(OPENBRACKET,'(',1,2615)
 LexToken(VAR,'nin',1,2616)
-LexToken(OPERATOR,'+',1,2619)
+LexToken(ADDITION,'+',1,2619)
 LexToken(NUMBER,'1',1,2620)
 LexToken(CLOSEBRACKET,')',1,2621)
-LexToken(OPERATOR,'*',1,2622)
+LexToken(MULTIPLICATION,'*',1,2622)
 LexToken(VAR,'N',1,2623)
-LexToken(OPERATOR,'+',1,2624)
+LexToken(ADDITION,'+',1,2624)
 LexToken(NUMBER,'2',1,2625)
 LexToken(THEN,'then',1,2627)
 LexToken(EOL,'\n',1,2631)
 LexToken(VAR,'dstate',1,2652)
 LexToken(ASSIGNMENT,'=',1,2658)
 LexToken(OPENSQBRACKET,'[',1,2659)
-LexToken(NUMBER,'-1',1,2660)
+LexToken(ADDITION,'-',1,2660)
+LexToken(NUMBER,'1',1,2661)
 LexToken(SEMICOLON,';',1,2662)
 LexToken(VAR,'lunit',1,2663)
 LexToken(SEMICOLON,';',1,2668)
@@ -373,10 +374,10 @@ LexToken(VAR,'zeros',1,2669)
 LexToken(OPENBRACKET,'(',1,2674)
 LexToken(OPENBRACKET,'(',1,2675)
 LexToken(VAR,'nin',1,2676)
-LexToken(OPERATOR,'+',1,2679)
+LexToken(ADDITION,'+',1,2679)
 LexToken(NUMBER,'1',1,2680)
 LexToken(CLOSEBRACKET,')',1,2681)
-LexToken(OPERATOR,'*',1,2682)
+LexToken(MULTIPLICATION,'*',1,2682)
 LexToken(VAR,'N',1,2683)
 LexToken(COMMA,',',1,2684)
 LexToken(NUMBER,'1',1,2685)
@@ -503,7 +504,8 @@ LexToken(DOT,'.',1,3229)
 LexToken(VAR,'dstate',1,3230)
 LexToken(ASSIGNMENT,'=',1,3236)
 LexToken(OPENSQBRACKET,'[',1,3237)
-LexToken(NUMBER,'-1',1,3238)
+LexToken(ADDITION,'-',1,3238)
+LexToken(NUMBER,'1',1,3239)
 LexToken(SEMICOLON,';',1,3240)
 LexToken(VAR,'lunit',1,3241)
 LexToken(SEMICOLON,';',1,3246)
@@ -511,10 +513,10 @@ LexToken(VAR,'zeros',1,3247)
 LexToken(OPENBRACKET,'(',1,3252)
 LexToken(OPENBRACKET,'(',1,3253)
 LexToken(VAR,'nin',1,3254)
-LexToken(OPERATOR,'+',1,3257)
+LexToken(ADDITION,'+',1,3257)
 LexToken(NUMBER,'1',1,3258)
 LexToken(CLOSEBRACKET,')',1,3259)
-LexToken(OPERATOR,'*',1,3260)
+LexToken(MULTIPLICATION,'*',1,3260)
 LexToken(VAR,'N',1,3261)
 LexToken(COMMA,',',1,3262)
 LexToken(NUMBER,'1',1,3263)
diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js
index da45524c..d43b03ee 100644
--- a/js/Sinks/WRITEC_f.js
+++ b/js/Sinks/WRITEC_f.js
@@ -335,7 +335,7 @@ LexToken(COMMA,',',1,2186)
 LexToken(VAR,'gettext',1,2207)
 LexToken(OPENBRACKET,'(',1,2214)
 LexToken(DQSTRING,'"Valid formats are: "',1,2235)
-LexToken(OPERATOR,'+',1,2237)
+LexToken(ADDITION,'+',1,2237)
 LexToken(VAR,'strcat',1,2239)
 LexToken(OPENBRACKET,'(',1,2245)
 LexToken(VAR,'fmts',1,2246)
@@ -677,19 +677,20 @@ LexToken(CLOSEBRACKET,')',1,4397)
 LexToken(COMPARISON,'<>',1,4398)
 LexToken(OPENBRACKET,'(',1,4400)
 LexToken(VAR,'nin',1,4401)
-LexToken(OPERATOR,'+',1,4404)
+LexToken(ADDITION,'+',1,4404)
 LexToken(NUMBER,'1',1,4405)
 LexToken(CLOSEBRACKET,')',1,4406)
-LexToken(OPERATOR,'*',1,4407)
+LexToken(MULTIPLICATION,'*',1,4407)
 LexToken(VAR,'N',1,4408)
-LexToken(OPERATOR,'+',1,4409)
+LexToken(ADDITION,'+',1,4409)
 LexToken(NUMBER,'2',1,4410)
 LexToken(THEN,'then',1,4412)
 LexToken(EOL,'\n',1,4416)
 LexToken(VAR,'dstate',1,4437)
 LexToken(ASSIGNMENT,'=',1,4443)
 LexToken(OPENSQBRACKET,'[',1,4444)
-LexToken(NUMBER,'-1',1,4445)
+LexToken(ADDITION,'-',1,4445)
+LexToken(NUMBER,'1',1,4446)
 LexToken(SEMICOLON,';',1,4447)
 LexToken(VAR,'lunit',1,4448)
 LexToken(SEMICOLON,';',1,4453)
@@ -697,10 +698,10 @@ LexToken(VAR,'zeros',1,4454)
 LexToken(OPENBRACKET,'(',1,4459)
 LexToken(OPENBRACKET,'(',1,4460)
 LexToken(VAR,'nin',1,4461)
-LexToken(OPERATOR,'+',1,4464)
+LexToken(ADDITION,'+',1,4464)
 LexToken(NUMBER,'1',1,4465)
 LexToken(CLOSEBRACKET,')',1,4466)
-LexToken(OPERATOR,'*',1,4467)
+LexToken(MULTIPLICATION,'*',1,4467)
 LexToken(VAR,'N',1,4468)
 LexToken(COMMA,',',1,4469)
 LexToken(NUMBER,'1',1,4470)
@@ -827,7 +828,8 @@ LexToken(DOT,'.',1,5123)
 LexToken(VAR,'dstate',1,5124)
 LexToken(ASSIGNMENT,'=',1,5130)
 LexToken(OPENSQBRACKET,'[',1,5131)
-LexToken(NUMBER,'-1',1,5132)
+LexToken(ADDITION,'-',1,5132)
+LexToken(NUMBER,'1',1,5133)
 LexToken(SEMICOLON,';',1,5134)
 LexToken(VAR,'lunit',1,5135)
 LexToken(SEMICOLON,';',1,5140)
@@ -835,10 +837,10 @@ LexToken(VAR,'zeros',1,5141)
 LexToken(OPENBRACKET,'(',1,5146)
 LexToken(OPENBRACKET,'(',1,5147)
 LexToken(VAR,'nin',1,5148)
-LexToken(OPERATOR,'+',1,5151)
+LexToken(ADDITION,'+',1,5151)
 LexToken(NUMBER,'1',1,5152)
 LexToken(CLOSEBRACKET,')',1,5153)
-LexToken(OPERATOR,'*',1,5154)
+LexToken(MULTIPLICATION,'*',1,5154)
 LexToken(VAR,'N',1,5155)
 LexToken(COMMA,',',1,5156)
 LexToken(NUMBER,'1',1,5157)