summaryrefslogtreecommitdiff
path: root/js/Sources
diff options
context:
space:
mode:
Diffstat (limited to 'js/Sources')
-rw-r--r--js/Sources/CLKINV_f.js6
-rw-r--r--js/Sources/CLKIN_f.js6
-rw-r--r--js/Sources/CLOCK_c.js11
-rw-r--r--js/Sources/CLOCK_f.js11
-rw-r--r--js/Sources/CONST.js3
-rw-r--r--js/Sources/CONST_f.js3
-rw-r--r--js/Sources/CONST_m.js3
-rw-r--r--js/Sources/CURVE_c.js516
-rw-r--r--js/Sources/CURV_f.js23
-rw-r--r--js/Sources/FROMWSB.js53
-rw-r--r--js/Sources/FROMWS_c.js18
-rw-r--r--js/Sources/GEN_SQR.js101
-rw-r--r--js/Sources/Ground_g.js3
-rw-r--r--js/Sources/INIMPL_f.js3
-rw-r--r--js/Sources/IN_f.js15
-rw-r--r--js/Sources/PULSE_SC.js81
-rw-r--r--js/Sources/RAND_f.js14
-rw-r--r--js/Sources/RAND_m.js26
-rw-r--r--js/Sources/READAU_f.js16
-rw-r--r--js/Sources/READC_f.js42
-rw-r--r--js/Sources/RFILE_f.js28
-rw-r--r--js/Sources/STEP.js10
-rw-r--r--js/Sources/STEP_FUNCTION.js29
-rw-r--r--js/Sources/SampleCLK.js6
-rw-r--r--js/Sources/Sigbuilder.js239
-rw-r--r--js/Sources/TKSCALE.js3
26 files changed, 734 insertions, 535 deletions
diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js
index 2c3dd0f4..42da7ab2 100644
--- a/js/Sources/CLKINV_f.js
+++ b/js/Sources/CLKINV_f.js
@@ -203,7 +203,8 @@ LexToken(VAR,'model',1,1781)
LexToken(DOT,'.',1,1786)
LexToken(VAR,'firing',1,1787)
LexToken(ASSIGNMENT,'=',1,1793)
-LexToken(NUMBER,'-1',1,1794)
+LexToken(ADDITION,'-',1,1794)
+LexToken(NUMBER,'1',1,1795)
LexToken(EOL,'\n',1,1811)
LexToken(VAR,'graphics',1,1828)
LexToken(DOT,'.',1,1836)
@@ -271,7 +272,8 @@ LexToken(VAR,'model',1,2139)
LexToken(DOT,'.',1,2144)
LexToken(VAR,'firing',1,2145)
LexToken(ASSIGNMENT,'=',1,2151)
-LexToken(NUMBER,'-1',1,2152)
+LexToken(ADDITION,'-',1,2152)
+LexToken(NUMBER,'1',1,2153)
LexToken(EOL,'\n',1,2154)
LexToken(VAR,'model',1,2163)
LexToken(DOT,'.',1,2168)
diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js
index cfaf106f..3b5e7e5c 100644
--- a/js/Sources/CLKIN_f.js
+++ b/js/Sources/CLKIN_f.js
@@ -169,7 +169,8 @@ LexToken(VAR,'model',1,1510)
LexToken(DOT,'.',1,1515)
LexToken(VAR,'firing',1,1516)
LexToken(ASSIGNMENT,'=',1,1522)
-LexToken(NUMBER,'-1',1,1523)
+LexToken(ADDITION,'-',1,1523)
+LexToken(NUMBER,'1',1,1524)
LexToken(EOL,'\n',1,1540)
LexToken(VAR,'graphics',1,1557)
LexToken(DOT,'.',1,1565)
@@ -237,7 +238,8 @@ LexToken(VAR,'model',1,1868)
LexToken(DOT,'.',1,1873)
LexToken(VAR,'firing',1,1874)
LexToken(ASSIGNMENT,'=',1,1880)
-LexToken(NUMBER,'-1',1,1881)
+LexToken(ADDITION,'-',1,1881)
+LexToken(NUMBER,'1',1,1882)
LexToken(EOL,'\n',1,1883)
LexToken(VAR,'model',1,1892)
LexToken(DOT,'.',1,1897)
diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js
index 818ba0e1..36093673 100644
--- a/js/Sources/CLOCK_c.js
+++ b/js/Sources/CLOCK_c.js
@@ -371,7 +371,7 @@ LexToken(VAR,'size',1,2497)
LexToken(OPENBRACKET,'(',1,2501)
LexToken(VAR,'newpar',1,2502)
LexToken(CLOSEBRACKET,')',1,2508)
-LexToken(OPERATOR,'+',1,2509)
+LexToken(ADDITION,'+',1,2509)
LexToken(NUMBER,'1',1,2510)
LexToken(CLOSEBRACKET,')',1,2511)
LexToken(ASSIGNMENT,'=',1,2512)
@@ -672,7 +672,8 @@ LexToken(ASSIGNMENT,'=',1,3685)
LexToken(OPENSQBRACKET,'[',1,3686)
LexToken(NUMBER,'5',1,3687)
LexToken(COMMA,',',1,3688)
-LexToken(NUMBER,'-1',1,3689)
+LexToken(ADDITION,'-',1,3689)
+LexToken(NUMBER,'1',1,3690)
LexToken(CLOSESQBRACKET,']',1,3691)
LexToken(COMMA,',',1,3692)
LexToken(VAR,'from',1,3693)
@@ -731,7 +732,8 @@ LexToken(ASSIGNMENT,'=',1,3822)
LexToken(OPENSQBRACKET,'[',1,3823)
LexToken(NUMBER,'5',1,3824)
LexToken(COMMA,',',1,3825)
-LexToken(NUMBER,'-1',1,3826)
+LexToken(ADDITION,'-',1,3826)
+LexToken(NUMBER,'1',1,3827)
LexToken(CLOSESQBRACKET,']',1,3828)
LexToken(COMMA,',',1,3829)
LexToken(VAR,'from',1,3830)
@@ -789,7 +791,8 @@ LexToken(ASSIGNMENT,'=',1,3962)
LexToken(OPENSQBRACKET,'[',1,3963)
LexToken(NUMBER,'5',1,3964)
LexToken(COMMA,',',1,3965)
-LexToken(NUMBER,'-1',1,3966)
+LexToken(ADDITION,'-',1,3966)
+LexToken(NUMBER,'1',1,3967)
LexToken(CLOSESQBRACKET,']',1,3968)
LexToken(COMMA,',',1,3969)
LexToken(VAR,'from',1,3970)
diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js
index 908b48d1..2a8c34c1 100644
--- a/js/Sources/CLOCK_f.js
+++ b/js/Sources/CLOCK_f.js
@@ -318,7 +318,7 @@ LexToken(VAR,'size',1,2164)
LexToken(OPENBRACKET,'(',1,2168)
LexToken(VAR,'newpar',1,2169)
LexToken(CLOSEBRACKET,')',1,2175)
-LexToken(OPERATOR,'+',1,2176)
+LexToken(ADDITION,'+',1,2176)
LexToken(NUMBER,'1',1,2177)
LexToken(CLOSEBRACKET,')',1,2178)
LexToken(ASSIGNMENT,'=',1,2179)
@@ -615,7 +615,8 @@ LexToken(ASSIGNMENT,'=',1,3346)
LexToken(OPENSQBRACKET,'[',1,3347)
LexToken(NUMBER,'5',1,3348)
LexToken(COMMA,',',1,3349)
-LexToken(NUMBER,'-1',1,3350)
+LexToken(ADDITION,'-',1,3350)
+LexToken(NUMBER,'1',1,3351)
LexToken(CLOSESQBRACKET,']',1,3352)
LexToken(COMMA,',',1,3353)
LexToken(VAR,'from',1,3354)
@@ -674,7 +675,8 @@ LexToken(ASSIGNMENT,'=',1,3483)
LexToken(OPENSQBRACKET,'[',1,3484)
LexToken(NUMBER,'5',1,3485)
LexToken(COMMA,',',1,3486)
-LexToken(NUMBER,'-1',1,3487)
+LexToken(ADDITION,'-',1,3487)
+LexToken(NUMBER,'1',1,3488)
LexToken(CLOSESQBRACKET,']',1,3489)
LexToken(COMMA,',',1,3490)
LexToken(VAR,'from',1,3491)
@@ -732,7 +734,8 @@ LexToken(ASSIGNMENT,'=',1,3623)
LexToken(OPENSQBRACKET,'[',1,3624)
LexToken(NUMBER,'5',1,3625)
LexToken(COMMA,',',1,3626)
-LexToken(NUMBER,'-1',1,3627)
+LexToken(ADDITION,'-',1,3627)
+LexToken(NUMBER,'1',1,3628)
LexToken(CLOSESQBRACKET,']',1,3629)
LexToken(COMMA,',',1,3630)
LexToken(VAR,'from',1,3631)
diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js
index ad25b446..e72b79dd 100644
--- a/js/Sources/CONST.js
+++ b/js/Sources/CONST.js
@@ -111,7 +111,8 @@ LexToken(VAR,'list',1,1152)
LexToken(OPENBRACKET,'(',1,1156)
LexToken(DQSTRING,'"vec"',1,1161)
LexToken(COMMA,',',1,1162)
-LexToken(NUMBER,'-1',1,1163)
+LexToken(ADDITION,'-',1,1163)
+LexToken(NUMBER,'1',1,1164)
LexToken(CLOSEBRACKET,')',1,1165)
LexToken(COMMA,',',1,1166)
LexToken(VAR,'exprs',1,1167)
diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js
index 0160275a..996fd885 100644
--- a/js/Sources/CONST_f.js
+++ b/js/Sources/CONST_f.js
@@ -112,7 +112,8 @@ LexToken(VAR,'list',1,1155)
LexToken(OPENBRACKET,'(',1,1159)
LexToken(DQSTRING,'"vec"',1,1164)
LexToken(COMMA,',',1,1165)
-LexToken(NUMBER,'-1',1,1166)
+LexToken(ADDITION,'-',1,1166)
+LexToken(NUMBER,'1',1,1167)
LexToken(CLOSEBRACKET,')',1,1168)
LexToken(COMMA,',',1,1169)
LexToken(VAR,'exprs',1,1170)
diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js
index e4f3ffa9..bba55d6b 100644
--- a/js/Sources/CONST_m.js
+++ b/js/Sources/CONST_m.js
@@ -132,7 +132,8 @@ LexToken(VAR,'list',1,1330)
LexToken(OPENBRACKET,'(',1,1334)
LexToken(DQSTRING,'"vec"',1,1339)
LexToken(COMMA,',',1,1340)
-LexToken(NUMBER,'-1',1,1342)
+LexToken(ADDITION,'-',1,1342)
+LexToken(NUMBER,'1',1,1343)
LexToken(CLOSEBRACKET,')',1,1344)
LexToken(COMMA,',',1,1345)
LexToken(VAR,'exprs',1,1347)
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index 6bcb7f3e..51cefb3c 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -136,7 +136,7 @@ LexToken(DQSTRING,'"Spline data"',1,1444)
LexToken(COMMA,',',1,1445)
LexToken(OPENSQBRACKET,'[',1,1446)
LexToken(DQSTRING,'"Spline"',1,1454)
-LexToken(OPERATOR,'+',1,1455)
+LexToken(ADDITION,'+',1,1455)
LexToken(DQSTRING,'" Method (0..7)"',1,1487)
LexToken(SEMICOLON,';',1,1488)
LexToken(DQSTRING,'"x"',1,1491)
@@ -146,7 +146,7 @@ LexToken(SEMICOLON,';',1,1496)
LexToken(DQSTRING,'"Periodic signal(y/n)?"',1,1519)
LexToken(SEMICOLON,';',1,1520)
LexToken(DQSTRING,'"Launch"',1,1528)
-LexToken(OPERATOR,'+',1,1529)
+LexToken(ADDITION,'+',1,1529)
LexToken(DQSTRING,'" graphic window(y/n)?"',1,1568)
LexToken(CLOSESQBRACKET,']',1,1569)
LexToken(COMMA,',',1,1570)
@@ -158,11 +158,13 @@ LexToken(NUMBER,'1',1,1582)
LexToken(COMMA,',',1,1583)
LexToken(DQSTRING,'"vec"',1,1588)
LexToken(COMMA,',',1,1589)
-LexToken(NUMBER,'-1',1,1590)
+LexToken(ADDITION,'-',1,1590)
+LexToken(NUMBER,'1',1,1591)
LexToken(COMMA,',',1,1592)
LexToken(DQSTRING,'"vec"',1,1614)
LexToken(COMMA,',',1,1615)
-LexToken(NUMBER,'-1',1,1616)
+LexToken(ADDITION,'-',1,1616)
+LexToken(NUMBER,'1',1,1617)
LexToken(COMMA,',',1,1618)
LexToken(DQSTRING,'"str"',1,1623)
LexToken(COMMA,',',1,1624)
@@ -444,7 +446,7 @@ LexToken(VAR,'winsid',1,3023)
LexToken(OPENBRACKET,'(',1,3029)
LexToken(CLOSEBRACKET,')',1,3030)
LexToken(CLOSEBRACKET,')',1,3031)
-LexToken(OPERATOR,'+',1,3032)
+LexToken(ADDITION,'+',1,3032)
LexToken(NUMBER,'1',1,3033)
LexToken(SEMICOLON,';',1,3034)
LexToken(EOL,'\n',1,3064)
@@ -503,11 +505,11 @@ LexToken(COMMA,',',1,3528)
LexToken(VAR,'orpar',1,3529)
LexToken(OPENBRACKET,'(',1,3534)
LexToken(VAR,'N2',1,3535)
-LexToken(OPERATOR,'+',1,3537)
+LexToken(ADDITION,'+',1,3537)
LexToken(NUMBER,'1',1,3538)
LexToken(COLON,':',1,3539)
LexToken(NUMBER,'2',1,3540)
-LexToken(OPERATOR,'*',1,3541)
+LexToken(MULTIPLICATION,'*',1,3541)
LexToken(VAR,'N2',1,3542)
LexToken(CLOSEBRACKET,')',1,3544)
LexToken(CLOSESQBRACKET,']',1,3545)
@@ -569,7 +571,8 @@ LexToken(OPENBRACKET,'(',1,3812)
LexToken(NUMBER,'1',1,3813)
LexToken(COLON,':',1,3814)
LexToken(VAR,'N',1,3815)
-LexToken(NUMBER,'-1',1,3816)
+LexToken(ADDITION,'-',1,3816)
+LexToken(NUMBER,'1',1,3817)
LexToken(COMMA,',',1,3818)
LexToken(NUMBER,'2',1,3819)
LexToken(CLOSEBRACKET,')',1,3820)
@@ -579,7 +582,8 @@ LexToken(OPENBRACKET,'(',1,3826)
LexToken(NUMBER,'1',1,3827)
LexToken(COLON,':',1,3828)
LexToken(VAR,'N2',1,3829)
-LexToken(NUMBER,'-1',1,3831)
+LexToken(ADDITION,'-',1,3831)
+LexToken(NUMBER,'1',1,3832)
LexToken(COMMA,',',1,3833)
LexToken(NUMBER,'2',1,3834)
LexToken(CLOSEBRACKET,')',1,3835)
@@ -941,7 +945,8 @@ LexToken(VAR,'model',1,5710)
LexToken(DOT,'.',1,5715)
LexToken(VAR,'firing',1,5716)
LexToken(ASSIGNMENT,'=',1,5722)
-LexToken(NUMBER,'-1',1,5723)
+LexToken(ADDITION,'-',1,5723)
+LexToken(NUMBER,'1',1,5724)
LexToken(SEMICOLON,';',1,5725)
LexToken(EOL,'\n',1,5726)
LexToken(END,'end',1,5743)
@@ -1011,7 +1016,8 @@ LexToken(NUMBER,'10',1,6053)
LexToken(COMMA,',',1,6055)
LexToken(NUMBER,'20',1,6057)
LexToken(COMMA,',',1,6059)
-LexToken(NUMBER,'-30',1,6061)
+LexToken(ADDITION,'-',1,6061)
+LexToken(NUMBER,'30',1,6062)
LexToken(CLOSESQBRACKET,']',1,6064)
LexToken(SEMICOLON,';',1,6065)
LexToken(EOL,'\n',1,6066)
@@ -1804,14 +1810,14 @@ LexToken(EOL,'\n',1,9183)
LexToken(VAR,'dx',1,9188)
LexToken(ASSIGNMENT,'=',1,9191)
LexToken(VAR,'xmx',1,9193)
-LexToken(OPERATOR,'-',1,9196)
+LexToken(ADDITION,'-',1,9196)
LexToken(VAR,'xmn',1,9197)
LexToken(SEMICOLON,';',1,9200)
LexToken(EOL,'\n',1,9201)
LexToken(VAR,'dy',1,9206)
LexToken(ASSIGNMENT,'=',1,9209)
LexToken(VAR,'ymx',1,9211)
-LexToken(OPERATOR,'-',1,9214)
+LexToken(ADDITION,'-',1,9214)
LexToken(VAR,'ymn',1,9215)
LexToken(EOL,'\n',1,9218)
LexToken(EOL,'\n',1,9219)
@@ -1826,7 +1832,7 @@ LexToken(ASSIGNMENT,'=',1,9248)
LexToken(VAR,'max',1,9249)
LexToken(OPENBRACKET,'(',1,9252)
LexToken(VAR,'xmx',1,9253)
-LexToken(OPERATOR,'/',1,9256)
+LexToken(MULTIPLICATION,'/',1,9256)
LexToken(NUMBER,'2',1,9257)
LexToken(COMMA,',',1,9258)
LexToken(NUMBER,'1',1,9259)
@@ -1839,9 +1845,9 @@ LexToken(EOL,'\n',1,9271)
LexToken(VAR,'xmx',1,9276)
LexToken(ASSIGNMENT,'=',1,9280)
LexToken(VAR,'xmx',1,9282)
-LexToken(OPERATOR,'+',1,9285)
+LexToken(ADDITION,'+',1,9285)
LexToken(VAR,'dx',1,9286)
-LexToken(OPERATOR,'/',1,9288)
+LexToken(MULTIPLICATION,'/',1,9288)
LexToken(NUMBER,'50',1,9289)
LexToken(SEMICOLON,';',1,9291)
LexToken(EOL,'\n',1,9292)
@@ -1857,7 +1863,7 @@ LexToken(ASSIGNMENT,'=',1,9322)
LexToken(VAR,'max',1,9323)
LexToken(OPENBRACKET,'(',1,9326)
LexToken(VAR,'ymx',1,9327)
-LexToken(OPERATOR,'/',1,9330)
+LexToken(MULTIPLICATION,'/',1,9330)
LexToken(NUMBER,'2',1,9331)
LexToken(COMMA,',',1,9332)
LexToken(NUMBER,'1',1,9333)
@@ -1870,18 +1876,18 @@ LexToken(EOL,'\n',1,9345)
LexToken(VAR,'ymn',1,9350)
LexToken(ASSIGNMENT,'=',1,9354)
LexToken(VAR,'ymn',1,9356)
-LexToken(OPERATOR,'-',1,9359)
+LexToken(ADDITION,'-',1,9359)
LexToken(VAR,'dy',1,9360)
-LexToken(OPERATOR,'/',1,9362)
+LexToken(MULTIPLICATION,'/',1,9362)
LexToken(NUMBER,'50',1,9363)
LexToken(SEMICOLON,';',1,9365)
LexToken(EOL,'\n',1,9366)
LexToken(VAR,'ymx',1,9371)
LexToken(ASSIGNMENT,'=',1,9375)
LexToken(VAR,'ymx',1,9377)
-LexToken(OPERATOR,'+',1,9380)
+LexToken(ADDITION,'+',1,9380)
LexToken(VAR,'dy',1,9381)
-LexToken(OPERATOR,'/',1,9383)
+LexToken(MULTIPLICATION,'/',1,9383)
LexToken(NUMBER,'50',1,9384)
LexToken(SEMICOLON,';',1,9386)
LexToken(EOL,'\n',1,9387)
@@ -2042,7 +2048,7 @@ LexToken(OPENBRACKET,'(',1,10037)
LexToken(VAR,'menu_o',1,10038)
LexToken(CLOSEBRACKET,')',1,10044)
LexToken(CLOSEBRACKET,')',1,10045)
-LexToken(OPERATOR,'+',1,10046)
+LexToken(ADDITION,'+',1,10046)
LexToken(VAR,'string',1,10047)
LexToken(OPENBRACKET,'(',1,10053)
LexToken(NUMBER,'1',1,10054)
@@ -2054,7 +2060,7 @@ LexToken(COMMA,',',1,10067)
LexToken(DQSTRING,'"*"',1,10070)
LexToken(CLOSEBRACKET,')',1,10071)
LexToken(CLOSEBRACKET,')',1,10072)
-LexToken(OPERATOR,'+',1,10073)
+LexToken(ADDITION,'+',1,10073)
LexToken(VAR,'r',1,10074)
LexToken(OPENBRACKET,'(',1,10075)
LexToken(VAR,'ones',1,10076)
@@ -2082,7 +2088,7 @@ LexToken(OPENBRACKET,'(',1,10136)
LexToken(VAR,'menu_d',1,10137)
LexToken(CLOSEBRACKET,')',1,10143)
LexToken(CLOSEBRACKET,')',1,10144)
-LexToken(OPERATOR,'+',1,10145)
+LexToken(ADDITION,'+',1,10145)
LexToken(VAR,'string',1,10146)
LexToken(OPENBRACKET,'(',1,10152)
LexToken(NUMBER,'1',1,10153)
@@ -2094,7 +2100,7 @@ LexToken(COMMA,',',1,10166)
LexToken(DQSTRING,'"*"',1,10169)
LexToken(CLOSEBRACKET,')',1,10170)
LexToken(CLOSEBRACKET,')',1,10171)
-LexToken(OPERATOR,'+',1,10172)
+LexToken(ADDITION,'+',1,10172)
LexToken(VAR,'r',1,10173)
LexToken(OPENBRACKET,'(',1,10174)
LexToken(VAR,'ones',1,10175)
@@ -2122,7 +2128,7 @@ LexToken(OPENBRACKET,'(',1,10236)
LexToken(VAR,'menu_t',1,10237)
LexToken(CLOSEBRACKET,')',1,10243)
LexToken(CLOSEBRACKET,')',1,10244)
-LexToken(OPERATOR,'+',1,10245)
+LexToken(ADDITION,'+',1,10245)
LexToken(VAR,'string',1,10246)
LexToken(OPENBRACKET,'(',1,10252)
LexToken(NUMBER,'1',1,10253)
@@ -2134,7 +2140,7 @@ LexToken(COMMA,',',1,10266)
LexToken(DQSTRING,'"*"',1,10269)
LexToken(CLOSEBRACKET,')',1,10270)
LexToken(CLOSEBRACKET,')',1,10271)
-LexToken(OPERATOR,'+',1,10272)
+LexToken(ADDITION,'+',1,10272)
LexToken(VAR,'r',1,10273)
LexToken(OPENBRACKET,'(',1,10274)
LexToken(VAR,'ones',1,10275)
@@ -2162,7 +2168,7 @@ LexToken(OPENBRACKET,'(',1,10335)
LexToken(VAR,'menu_e',1,10336)
LexToken(CLOSEBRACKET,')',1,10342)
LexToken(CLOSEBRACKET,')',1,10343)
-LexToken(OPERATOR,'+',1,10344)
+LexToken(ADDITION,'+',1,10344)
LexToken(VAR,'string',1,10345)
LexToken(OPENBRACKET,'(',1,10351)
LexToken(NUMBER,'1',1,10352)
@@ -2174,7 +2180,7 @@ LexToken(COMMA,',',1,10365)
LexToken(DQSTRING,'"*"',1,10368)
LexToken(CLOSEBRACKET,')',1,10369)
LexToken(CLOSEBRACKET,')',1,10370)
-LexToken(OPERATOR,'+',1,10371)
+LexToken(ADDITION,'+',1,10371)
LexToken(VAR,'r',1,10372)
LexToken(OPENBRACKET,'(',1,10373)
LexToken(VAR,'ones',1,10374)
@@ -2187,60 +2193,60 @@ LexToken(EOL,'\n',1,10388)
LexToken(VAR,'execstr',1,10393)
LexToken(OPENBRACKET,'(',1,10400)
LexToken(DQSTRING,'"Autoscale_"',1,10412)
-LexToken(OPERATOR,'+',1,10413)
+LexToken(ADDITION,'+',1,10413)
LexToken(VAR,'string',1,10414)
LexToken(OPENBRACKET,'(',1,10420)
LexToken(VAR,'curwin',1,10421)
LexToken(CLOSEBRACKET,')',1,10427)
-LexToken(OPERATOR,'+',1,10428)
+LexToken(ADDITION,'+',1,10428)
LexToken(DQSTRING,'"=scam"',1,10435)
LexToken(CLOSEBRACKET,')',1,10436)
LexToken(EOL,'\n',1,10437)
LexToken(VAR,'execstr',1,10442)
LexToken(OPENBRACKET,'(',1,10449)
LexToken(DQSTRING,'"Spline_"',1,10458)
-LexToken(OPERATOR,'+',1,10459)
+LexToken(ADDITION,'+',1,10459)
LexToken(VAR,'string',1,10460)
LexToken(OPENBRACKET,'(',1,10466)
LexToken(VAR,'curwin',1,10467)
LexToken(CLOSEBRACKET,')',1,10473)
-LexToken(OPERATOR,'+',1,10474)
+LexToken(ADDITION,'+',1,10474)
LexToken(DQSTRING,'"=Orderm"',1,10483)
LexToken(CLOSEBRACKET,')',1,10484)
LexToken(EOL,'\n',1,10485)
LexToken(VAR,'execstr',1,10490)
LexToken(OPENBRACKET,'(',1,10497)
LexToken(DQSTRING,'"Data_"',1,10504)
-LexToken(OPERATOR,'+',1,10505)
+LexToken(ADDITION,'+',1,10505)
LexToken(VAR,'string',1,10506)
LexToken(OPENBRACKET,'(',1,10512)
LexToken(VAR,'curwin',1,10513)
LexToken(CLOSEBRACKET,')',1,10519)
-LexToken(OPERATOR,'+',1,10520)
+LexToken(ADDITION,'+',1,10520)
LexToken(DQSTRING,'"=Datam"',1,10528)
LexToken(CLOSEBRACKET,')',1,10529)
LexToken(EOL,'\n',1,10530)
LexToken(VAR,'execstr',1,10535)
LexToken(OPENBRACKET,'(',1,10542)
LexToken(DQSTRING,'"Standards_"',1,10554)
-LexToken(OPERATOR,'+',1,10555)
+LexToken(ADDITION,'+',1,10555)
LexToken(VAR,'string',1,10556)
LexToken(OPENBRACKET,'(',1,10562)
LexToken(VAR,'curwin',1,10563)
LexToken(CLOSEBRACKET,')',1,10569)
-LexToken(OPERATOR,'+',1,10570)
+LexToken(ADDITION,'+',1,10570)
LexToken(DQSTRING,'"=Standm"',1,10579)
LexToken(CLOSEBRACKET,')',1,10580)
LexToken(EOL,'\n',1,10581)
LexToken(VAR,'execstr',1,10586)
LexToken(OPENBRACKET,'(',1,10593)
LexToken(DQSTRING,'"Exit_"',1,10600)
-LexToken(OPERATOR,'+',1,10601)
+LexToken(ADDITION,'+',1,10601)
LexToken(VAR,'string',1,10602)
LexToken(OPENBRACKET,'(',1,10608)
LexToken(VAR,'curwin',1,10609)
LexToken(CLOSEBRACKET,')',1,10615)
-LexToken(OPERATOR,'+',1,10616)
+LexToken(ADDITION,'+',1,10616)
LexToken(DQSTRING,'"=Exitm"',1,10624)
LexToken(CLOSEBRACKET,')',1,10625)
LexToken(EOL,'\n',1,10626)
@@ -2403,7 +2409,8 @@ LexToken(NUMBER,'2',1,11141)
LexToken(CLOSEBRACKET,')',1,11142)
LexToken(COMMA,',',1,11143)
LexToken(OPENSQBRACKET,'[',1,11144)
-LexToken(NUMBER,'-1',1,11145)
+LexToken(ADDITION,'-',1,11145)
+LexToken(NUMBER,'1',1,11146)
LexToken(CLOSESQBRACKET,']',1,11147)
LexToken(CLOSEBRACKET,')',1,11148)
LexToken(SEMICOLON,';',1,11149)
@@ -3138,9 +3145,9 @@ LexToken(OPENBRACKET,'(',1,14956)
LexToken(NUMBER,'0',1,14957)
LexToken(COMMA,',',1,14958)
LexToken(PREVAR_FLOAT,'%pi',1,14959)
-LexToken(OPERATOR,'*',1,14962)
+LexToken(MULTIPLICATION,'*',1,14962)
LexToken(NUMBER,'2',1,14963)
-LexToken(OPERATOR,'/',1,14964)
+LexToken(MULTIPLICATION,'/',1,14964)
LexToken(VAR,'wp',1,14965)
LexToken(COMMA,',',1,14967)
LexToken(VAR,'np1',1,14968)
@@ -3151,16 +3158,16 @@ LexToken(EOL,'\n',1,14974)
LexToken(VAR,'yt',1,14991)
LexToken(ASSIGNMENT,'=',1,14993)
LexToken(VAR,'Amp',1,14994)
-LexToken(OPERATOR,'*',1,14997)
+LexToken(MULTIPLICATION,'*',1,14997)
LexToken(VAR,'sin',1,14998)
LexToken(OPENBRACKET,'(',1,15001)
LexToken(VAR,'wp',1,15002)
-LexToken(OPERATOR,'*',1,15004)
+LexToken(MULTIPLICATION,'*',1,15004)
LexToken(VAR,'xt',1,15005)
-LexToken(OPERATOR,'+',1,15007)
+LexToken(ADDITION,'+',1,15007)
LexToken(VAR,'phase',1,15008)
LexToken(CLOSEBRACKET,')',1,15013)
-LexToken(OPERATOR,'+',1,15014)
+LexToken(ADDITION,'+',1,15014)
LexToken(VAR,'offset',1,15015)
LexToken(SEMICOLON,';',1,15021)
LexToken(EOL,'\n',1,15022)
@@ -3417,7 +3424,7 @@ LexToken(ASSIGNMENT,'=',1,16318)
LexToken(OPENSQBRACKET,'[',1,16319)
LexToken(VAR,'sAmp2',1,16320)
LexToken(SEMICOLON,';',1,16325)
-LexToken(OPERATOR,'-',1,16326)
+LexToken(ADDITION,'-',1,16326)
LexToken(VAR,'sAmp2',1,16327)
LexToken(CLOSESQBRACKET,']',1,16332)
LexToken(SEMICOLON,';',1,16333)
@@ -3486,7 +3493,7 @@ LexToken(SEMICOLON,';',1,16711)
LexToken(DQSTRING,'"Period (sec)"',1,16725)
LexToken(SEMICOLON,';',1,16726)
LexToken(DQSTRING,'"Pulse width(% o"',1,16743)
-LexToken(OPERATOR,'+',1,16744)
+LexToken(ADDITION,'+',1,16744)
LexToken(DQSTRING,'"f period)"',1,16771)
LexToken(SEMICOLON,';',1,16772)
LexToken(DQSTRING,'"Phase delay (sec)"',1,16791)
@@ -3597,11 +3604,11 @@ LexToken(SEMICOLON,';',1,17310)
LexToken(VAR,'Pd3',1,17311)
LexToken(SEMICOLON,';',1,17314)
LexToken(VAR,'Pw3',1,17316)
-LexToken(OPERATOR,'*',1,17319)
+LexToken(MULTIPLICATION,'*',1,17319)
LexToken(VAR,'Tp3',1,17320)
-LexToken(OPERATOR,'/',1,17323)
+LexToken(MULTIPLICATION,'/',1,17323)
LexToken(NUMBER,'100',1,17324)
-LexToken(OPERATOR,'+',1,17327)
+LexToken(ADDITION,'+',1,17327)
LexToken(VAR,'Pd3',1,17328)
LexToken(SEMICOLON,';',1,17331)
LexToken(VAR,'Tp3',1,17332)
@@ -3614,7 +3621,7 @@ LexToken(OPENSQBRACKET,'[',1,17365)
LexToken(VAR,'yt',1,17366)
LexToken(SEMICOLON,';',1,17368)
LexToken(VAR,'Amp3',1,17369)
-LexToken(OPERATOR,'+',1,17373)
+LexToken(ADDITION,'+',1,17373)
LexToken(VAR,'Bias3',1,17374)
LexToken(SEMICOLON,';',1,17379)
LexToken(VAR,'Bias3',1,17380)
@@ -3805,10 +3812,11 @@ LexToken(COLON,':',1,18320)
LexToken(VAR,'sample4',1,18321)
LexToken(COLON,':',1,18328)
LexToken(VAR,'sample4',1,18329)
-LexToken(OPERATOR,'*',1,18336)
+LexToken(MULTIPLICATION,'*',1,18336)
LexToken(OPENBRACKET,'(',1,18337)
LexToken(VAR,'np4',1,18338)
-LexToken(NUMBER,'-1',1,18341)
+LexToken(ADDITION,'-',1,18341)
+LexToken(NUMBER,'1',1,18342)
LexToken(CLOSEBRACKET,')',1,18343)
LexToken(SEMICOLON,';',1,18344)
LexToken(EOL,'\n',1,18345)
@@ -3823,12 +3831,12 @@ LexToken(EOL,'\n',1,18371)
LexToken(VAR,'yt',1,18388)
LexToken(ASSIGNMENT,'=',1,18390)
LexToken(VAR,'mean4',1,18391)
-LexToken(OPERATOR,'+',1,18396)
+LexToken(ADDITION,'+',1,18396)
LexToken(VAR,'sqrt',1,18397)
LexToken(OPENBRACKET,'(',1,18401)
LexToken(VAR,'var4',1,18402)
LexToken(CLOSEBRACKET,')',1,18406)
-LexToken(OPERATOR,'*',1,18407)
+LexToken(MULTIPLICATION,'*',1,18407)
LexToken(VAR,'rand',1,18408)
LexToken(OPENBRACKET,'(',1,18412)
LexToken(VAR,'np4',1,18413)
@@ -3976,10 +3984,11 @@ LexToken(COLON,':',1,19153)
LexToken(VAR,'sample5',1,19154)
LexToken(COLON,':',1,19161)
LexToken(VAR,'sample5',1,19162)
-LexToken(OPERATOR,'*',1,19169)
+LexToken(MULTIPLICATION,'*',1,19169)
LexToken(OPENBRACKET,'(',1,19170)
LexToken(VAR,'np5',1,19171)
-LexToken(NUMBER,'-1',1,19174)
+LexToken(ADDITION,'-',1,19174)
+LexToken(NUMBER,'1',1,19175)
LexToken(CLOSEBRACKET,')',1,19176)
LexToken(SEMICOLON,';',1,19177)
LexToken(EOL,'\n',1,19178)
@@ -3994,13 +4003,13 @@ LexToken(EOL,'\n',1,19204)
LexToken(VAR,'yt',1,19221)
LexToken(ASSIGNMENT,'=',1,19223)
LexToken(VAR,'min5',1,19224)
-LexToken(OPERATOR,'+',1,19228)
+LexToken(ADDITION,'+',1,19228)
LexToken(OPENBRACKET,'(',1,19229)
LexToken(VAR,'max5',1,19230)
-LexToken(OPERATOR,'-',1,19234)
+LexToken(ADDITION,'-',1,19234)
LexToken(VAR,'min5',1,19235)
LexToken(CLOSEBRACKET,')',1,19239)
-LexToken(OPERATOR,'*',1,19240)
+LexToken(MULTIPLICATION,'*',1,19240)
LexToken(VAR,'rand',1,19241)
LexToken(OPENBRACKET,'(',1,19245)
LexToken(VAR,'np5',1,19246)
@@ -4299,11 +4308,13 @@ LexToken(VAR,'list',1,20803)
LexToken(OPENBRACKET,'(',1,20807)
LexToken(DQSTRING,'"vec"',1,20812)
LexToken(COMMA,',',1,20813)
-LexToken(NUMBER,'-1',1,20814)
+LexToken(ADDITION,'-',1,20814)
+LexToken(NUMBER,'1',1,20815)
LexToken(COMMA,',',1,20816)
LexToken(DQSTRING,'"vec"',1,20821)
LexToken(COMMA,',',1,20822)
-LexToken(NUMBER,'-1',1,20823)
+LexToken(ADDITION,'-',1,20823)
+LexToken(NUMBER,'1',1,20824)
LexToken(CLOSEBRACKET,')',1,20825)
LexToken(COMMA,',',1,20826)
LexToken(VAR,'list',1,20827)
@@ -4637,35 +4648,35 @@ LexToken(ASSIGNMENT,'=',1,22835)
LexToken(OPENBRACKET,'(',1,22836)
LexToken(OPENBRACKET,'(',1,22837)
LexToken(VAR,'xt',1,22838)
-LexToken(OPERATOR,'-',1,22840)
+LexToken(ADDITION,'-',1,22840)
LexToken(VAR,'ones',1,22841)
LexToken(OPENBRACKET,'(',1,22845)
LexToken(VAR,'N',1,22846)
LexToken(COMMA,',',1,22847)
LexToken(NUMBER,'1',1,22848)
LexToken(CLOSEBRACKET,')',1,22849)
-LexToken(OPERATOR,'*',1,22850)
+LexToken(MULTIPLICATION,'*',1,22850)
LexToken(VAR,'xc',1,22851)
LexToken(CLOSEBRACKET,')',1,22853)
LexToken(CLOSEBRACKET,')',1,22854)
-LexToken(OPERATOR,'^',1,22855)
+LexToken(MULTIPLICATION,'^',1,22855)
LexToken(NUMBER,'2',1,22856)
-LexToken(OPERATOR,'+',1,22857)
+LexToken(ADDITION,'+',1,22857)
LexToken(OPENBRACKET,'(',1,22858)
LexToken(OPENBRACKET,'(',1,22859)
LexToken(VAR,'yt',1,22860)
-LexToken(OPERATOR,'-',1,22862)
+LexToken(ADDITION,'-',1,22862)
LexToken(VAR,'ones',1,22863)
LexToken(OPENBRACKET,'(',1,22867)
LexToken(VAR,'N',1,22868)
LexToken(COMMA,',',1,22869)
LexToken(NUMBER,'1',1,22870)
LexToken(CLOSEBRACKET,')',1,22871)
-LexToken(OPERATOR,'*',1,22872)
+LexToken(MULTIPLICATION,'*',1,22872)
LexToken(VAR,'yc',1,22873)
LexToken(CLOSEBRACKET,')',1,22875)
LexToken(CLOSEBRACKET,')',1,22876)
-LexToken(OPERATOR,'^',1,22877)
+LexToken(MULTIPLICATION,'^',1,22877)
LexToken(NUMBER,'2',1,22878)
LexToken(EOL,'\n',1,22879)
LexToken(OPENSQBRACKET,'[',1,22896)
@@ -4697,7 +4708,7 @@ LexToken(NUMBER,'2',1,22981)
LexToken(COMMA,',',1,22982)
LexToken(NUMBER,'1',1,22983)
LexToken(CLOSEBRACKET,')',1,22984)
-LexToken(OPERATOR,'-',1,22985)
+LexToken(ADDITION,'-',1,22985)
LexToken(VAR,'rectx',1,22986)
LexToken(OPENBRACKET,'(',1,22991)
LexToken(NUMBER,'1',1,22992)
@@ -4705,7 +4716,7 @@ LexToken(COMMA,',',1,22993)
LexToken(NUMBER,'1',1,22994)
LexToken(CLOSEBRACKET,')',1,22995)
LexToken(CLOSEBRACKET,')',1,22996)
-LexToken(OPERATOR,'/',1,22997)
+LexToken(MULTIPLICATION,'/',1,22997)
LexToken(NUMBER,'80',1,22998)
LexToken(SEMICOLON,';',1,23000)
LexToken(EOL,'\n',1,23001)
@@ -4719,7 +4730,7 @@ LexToken(NUMBER,'2',1,23031)
LexToken(COMMA,',',1,23032)
LexToken(NUMBER,'2',1,23033)
LexToken(CLOSEBRACKET,')',1,23034)
-LexToken(OPERATOR,'-',1,23035)
+LexToken(ADDITION,'-',1,23035)
LexToken(VAR,'rectx',1,23036)
LexToken(OPENBRACKET,'(',1,23041)
LexToken(NUMBER,'1',1,23042)
@@ -4727,7 +4738,7 @@ LexToken(COMMA,',',1,23043)
LexToken(NUMBER,'2',1,23044)
LexToken(CLOSEBRACKET,')',1,23045)
LexToken(CLOSEBRACKET,')',1,23046)
-LexToken(OPERATOR,'/',1,23047)
+LexToken(MULTIPLICATION,'/',1,23047)
LexToken(NUMBER,'80',1,23048)
LexToken(SEMICOLON,';',1,23050)
LexToken(EOL,'\n',1,23051)
@@ -4736,7 +4747,7 @@ LexToken(OPENBRACKET,'(',1,23071)
LexToken(VAR,'abs',1,23072)
LexToken(OPENBRACKET,'(',1,23075)
LexToken(VAR,'xc',1,23076)
-LexToken(OPERATOR,'-',1,23078)
+LexToken(ADDITION,'-',1,23078)
LexToken(VAR,'xt',1,23079)
LexToken(OPENBRACKET,'(',1,23081)
LexToken(VAR,'k',1,23082)
@@ -4748,7 +4759,7 @@ LexToken(LOGICAL,'&',1,23089)
LexToken(VAR,'abs',1,23091)
LexToken(OPENBRACKET,'(',1,23094)
LexToken(VAR,'yc',1,23095)
-LexToken(OPERATOR,'-',1,23097)
+LexToken(ADDITION,'-',1,23097)
LexToken(VAR,'yt',1,23098)
LexToken(OPENBRACKET,'(',1,23100)
LexToken(VAR,'k',1,23101)
@@ -5306,14 +5317,14 @@ LexToken(EOL,'\n',1,25412)
LexToken(VAR,'PERIODIC',1,25421)
LexToken(ASSIGNMENT,'=',1,25429)
LexToken(DQSTRING,'"periodic, T="',1,25443)
-LexToken(OPERATOR,'+',1,25444)
+LexToken(ADDITION,'+',1,25444)
LexToken(VAR,'string',1,25445)
LexToken(OPENBRACKET,'(',1,25451)
LexToken(VAR,'x',1,25452)
LexToken(OPENBRACKET,'(',1,25453)
LexToken(VAR,'N',1,25454)
LexToken(CLOSEBRACKET,')',1,25455)
-LexToken(OPERATOR,'-',1,25456)
+LexToken(ADDITION,'-',1,25456)
LexToken(VAR,'x',1,25457)
LexToken(OPENBRACKET,'(',1,25458)
LexToken(NUMBER,'1',1,25459)
@@ -5341,15 +5352,15 @@ LexToken(VAR,'string',1,25529)
LexToken(OPENBRACKET,'(',1,25535)
LexToken(VAR,'N',1,25536)
LexToken(CLOSEBRACKET,')',1,25537)
-LexToken(OPERATOR,'+',1,25538)
+LexToken(ADDITION,'+',1,25538)
LexToken(DQSTRING,'" points, "',1,25550)
-LexToken(OPERATOR,'+',1,25551)
+LexToken(ADDITION,'+',1,25551)
LexToken(DQSTRING,'"Method: "',1,25561)
-LexToken(OPERATOR,'+',1,25562)
+LexToken(ADDITION,'+',1,25562)
LexToken(VAR,'METHOD',1,25563)
-LexToken(OPERATOR,'+',1,25569)
+LexToken(ADDITION,'+',1,25569)
LexToken(DQSTRING,'", "',1,25574)
-LexToken(OPERATOR,'+',1,25575)
+LexToken(ADDITION,'+',1,25575)
LexToken(VAR,'PERIODIC',1,25576)
LexToken(CLOSESQBRACKET,']',1,25584)
LexToken(SEMICOLON,';',1,25585)
@@ -5715,7 +5726,8 @@ LexToken(EOL,'\n',1,26693)
LexToken(EOL,'\n',1,26694)
LexToken(VAR,'btn',1,26699)
LexToken(ASSIGNMENT,'=',1,26702)
-LexToken(NUMBER,'-1',1,26703)
+LexToken(ADDITION,'-',1,26703)
+LexToken(NUMBER,'1',1,26704)
LexToken(EOL,'\n',1,26705)
LexToken(EOL,'\n',1,26706)
LexToken(WHILE,'while',1,26711)
@@ -5735,7 +5747,8 @@ LexToken(NUMBER,'10',1,26741)
LexToken(LOGICAL,'|',1,26743)
LexToken(VAR,'btn',1,26745)
LexToken(COMPARISON,'==',1,26748)
-LexToken(NUMBER,'-5',1,26750)
+LexToken(ADDITION,'-',1,26750)
+LexToken(NUMBER,'5',1,26751)
LexToken(CLOSEBRACKET,')',1,26752)
LexToken(EOL,'\n',1,26753)
LexToken(VAR,'rep',1,26762)
@@ -6117,14 +6130,14 @@ LexToken(EOL,'\n',1,27836)
LexToken(VAR,'dx',1,27841)
LexToken(ASSIGNMENT,'=',1,27843)
LexToken(VAR,'XMX',1,27844)
-LexToken(OPERATOR,'-',1,27847)
+LexToken(ADDITION,'-',1,27847)
LexToken(VAR,'XMN',1,27848)
LexToken(SEMICOLON,';',1,27851)
LexToken(EOL,'\n',1,27852)
LexToken(VAR,'dy',1,27857)
LexToken(ASSIGNMENT,'=',1,27859)
LexToken(VAR,'YMX',1,27860)
-LexToken(OPERATOR,'-',1,27863)
+LexToken(ADDITION,'-',1,27863)
LexToken(VAR,'YMN',1,27864)
LexToken(EOL,'\n',1,27867)
LexToken(IF,'if',1,27872)
@@ -6138,7 +6151,7 @@ LexToken(ASSIGNMENT,'=',1,27896)
LexToken(VAR,'max',1,27897)
LexToken(OPENBRACKET,'(',1,27900)
LexToken(VAR,'XMX',1,27901)
-LexToken(OPERATOR,'/',1,27904)
+LexToken(MULTIPLICATION,'/',1,27904)
LexToken(NUMBER,'2',1,27905)
LexToken(COMMA,',',1,27906)
LexToken(NUMBER,'1',1,27907)
@@ -6151,9 +6164,9 @@ LexToken(EOL,'\n',1,27919)
LexToken(VAR,'XMX',1,27924)
LexToken(ASSIGNMENT,'=',1,27927)
LexToken(VAR,'XMX',1,27928)
-LexToken(OPERATOR,'+',1,27931)
+LexToken(ADDITION,'+',1,27931)
LexToken(VAR,'dx',1,27932)
-LexToken(OPERATOR,'/',1,27934)
+LexToken(MULTIPLICATION,'/',1,27934)
LexToken(NUMBER,'50',1,27935)
LexToken(EOL,'\n',1,27937)
LexToken(IF,'if',1,27942)
@@ -6167,7 +6180,7 @@ LexToken(ASSIGNMENT,'=',1,27966)
LexToken(VAR,'max',1,27967)
LexToken(OPENBRACKET,'(',1,27970)
LexToken(VAR,'YMX',1,27971)
-LexToken(OPERATOR,'/',1,27974)
+LexToken(MULTIPLICATION,'/',1,27974)
LexToken(NUMBER,'2',1,27975)
LexToken(COMMA,',',1,27976)
LexToken(NUMBER,'1',1,27977)
@@ -6180,18 +6193,18 @@ LexToken(EOL,'\n',1,27989)
LexToken(VAR,'YMN',1,27994)
LexToken(ASSIGNMENT,'=',1,27997)
LexToken(VAR,'YMN',1,27998)
-LexToken(OPERATOR,'-',1,28001)
+LexToken(ADDITION,'-',1,28001)
LexToken(VAR,'dy',1,28002)
-LexToken(OPERATOR,'/',1,28004)
+LexToken(MULTIPLICATION,'/',1,28004)
LexToken(NUMBER,'50',1,28005)
LexToken(SEMICOLON,';',1,28007)
LexToken(EOL,'\n',1,28008)
LexToken(VAR,'YMX',1,28013)
LexToken(ASSIGNMENT,'=',1,28016)
LexToken(VAR,'YMX',1,28017)
-LexToken(OPERATOR,'+',1,28020)
+LexToken(ADDITION,'+',1,28020)
LexToken(VAR,'dy',1,28021)
-LexToken(OPERATOR,'/',1,28023)
+LexToken(MULTIPLICATION,'/',1,28023)
LexToken(NUMBER,'50',1,28024)
LexToken(SEMICOLON,';',1,28026)
LexToken(EOL,'\n',1,28027)
@@ -6391,7 +6404,7 @@ LexToken(OPENSQBRACKET,'[',1,28564)
LexToken(DQSTRING,'"Filename"',1,28574)
LexToken(SEMICOLON,';',1,28575)
LexToken(DQSTRING,'"Sheet #"',1,28584)
-LexToken(OPERATOR,'+',1,28585)
+LexToken(ADDITION,'+',1,28585)
LexToken(DQSTRING,'" "',1,28600)
LexToken(SEMICOLON,';',1,28601)
LexToken(DQSTRING,'"X[start:Stop]"',1,28616)
@@ -6473,7 +6486,7 @@ LexToken(EOL,'\n',1,28904)
LexToken(VAR,'xinfo',1,28917)
LexToken(OPENBRACKET,'(',1,28922)
LexToken(DQSTRING,'"Scicos cannot find the excel file:"',1,28958)
-LexToken(OPERATOR,'+',1,28959)
+LexToken(ADDITION,'+',1,28959)
LexToken(VAR,'filen',1,28960)
LexToken(CLOSEBRACKET,')',1,28965)
LexToken(SEMICOLON,';',1,28966)
@@ -6587,7 +6600,8 @@ LexToken(COMMA,',',1,29360)
LexToken(NUMBER,'1',1,29361)
LexToken(COLON,':',1,29362)
LexToken(VAR,'px',1,29363)
-LexToken(NUMBER,'-1',1,29365)
+LexToken(ADDITION,'-',1,29365)
+LexToken(NUMBER,'1',1,29366)
LexToken(CLOSEBRACKET,')',1,29367)
LexToken(SEMICOLON,';',1,29368)
LexToken(EOL,'\n',1,29369)
@@ -6598,7 +6612,7 @@ LexToken(OPENBRACKET,'(',1,29389)
LexToken(VAR,'xa',1,29390)
LexToken(COMMA,',',1,29392)
LexToken(VAR,'px',1,29393)
-LexToken(OPERATOR,'+',1,29395)
+LexToken(ADDITION,'+',1,29395)
LexToken(NUMBER,'1',1,29396)
LexToken(COLON,':',1,29397)
LexToken(VAR,'length',1,29398)
@@ -6617,7 +6631,8 @@ LexToken(COMMA,',',1,29433)
LexToken(NUMBER,'1',1,29434)
LexToken(COLON,':',1,29435)
LexToken(VAR,'py',1,29436)
-LexToken(NUMBER,'-1',1,29438)
+LexToken(ADDITION,'-',1,29438)
+LexToken(NUMBER,'1',1,29439)
LexToken(CLOSEBRACKET,')',1,29440)
LexToken(SEMICOLON,';',1,29441)
LexToken(EOL,'\n',1,29442)
@@ -6628,7 +6643,7 @@ LexToken(OPENBRACKET,'(',1,29462)
LexToken(VAR,'ya',1,29463)
LexToken(COMMA,',',1,29465)
LexToken(VAR,'py',1,29466)
-LexToken(OPERATOR,'+',1,29468)
+LexToken(ADDITION,'+',1,29468)
LexToken(NUMBER,'1',1,29469)
LexToken(COLON,':',1,29470)
LexToken(VAR,'length',1,29471)
@@ -6663,7 +6678,7 @@ LexToken(EOL,'\n',1,29551)
LexToken(VAR,'xinfo',1,29568)
LexToken(OPENBRACKET,'(',1,29573)
LexToken(DQSTRING,'"Bad address in X:"',1,29592)
-LexToken(OPERATOR,'+',1,29593)
+LexToken(ADDITION,'+',1,29593)
LexToken(VAR,'x1',1,29594)
LexToken(CLOSEBRACKET,')',1,29596)
LexToken(SEMICOLON,';',1,29597)
@@ -6682,7 +6697,8 @@ LexToken(COMMA,',',1,29661)
LexToken(NUMBER,'1',1,29662)
LexToken(COLON,':',1,29663)
LexToken(VAR,'x1p',1,29664)
-LexToken(NUMBER,'-1',1,29667)
+LexToken(ADDITION,'-',1,29667)
+LexToken(NUMBER,'1',1,29668)
LexToken(CLOSEBRACKET,')',1,29669)
LexToken(SEMICOLON,';',1,29670)
LexToken(EOL,'\n',1,29671)
@@ -6726,7 +6742,7 @@ LexToken(EOL,'\n',1,29780)
LexToken(VAR,'xinfo',1,29797)
LexToken(OPENBRACKET,'(',1,29802)
LexToken(DQSTRING,'"Bad address in X:"',1,29821)
-LexToken(OPERATOR,'+',1,29822)
+LexToken(ADDITION,'+',1,29822)
LexToken(VAR,'x2',1,29823)
LexToken(CLOSEBRACKET,')',1,29825)
LexToken(SEMICOLON,';',1,29826)
@@ -6746,7 +6762,8 @@ LexToken(COMMA,',',1,29887)
LexToken(NUMBER,'1',1,29888)
LexToken(COLON,':',1,29889)
LexToken(VAR,'x2p',1,29890)
-LexToken(NUMBER,'-1',1,29893)
+LexToken(ADDITION,'-',1,29893)
+LexToken(NUMBER,'1',1,29894)
LexToken(CLOSEBRACKET,')',1,29895)
LexToken(SEMICOLON,';',1,29896)
LexToken(EOL,'\n',1,29897)
@@ -6790,7 +6807,7 @@ LexToken(EOL,'\n',1,30006)
LexToken(VAR,'xinfo',1,30023)
LexToken(OPENBRACKET,'(',1,30028)
LexToken(DQSTRING,'"Bad address in Y:"',1,30047)
-LexToken(OPERATOR,'+',1,30048)
+LexToken(ADDITION,'+',1,30048)
LexToken(VAR,'y1',1,30049)
LexToken(CLOSEBRACKET,')',1,30051)
LexToken(SEMICOLON,';',1,30052)
@@ -6809,7 +6826,8 @@ LexToken(COMMA,',',1,30116)
LexToken(NUMBER,'1',1,30117)
LexToken(COLON,':',1,30118)
LexToken(VAR,'y1p',1,30119)
-LexToken(NUMBER,'-1',1,30122)
+LexToken(ADDITION,'-',1,30122)
+LexToken(NUMBER,'1',1,30123)
LexToken(CLOSEBRACKET,')',1,30124)
LexToken(SEMICOLON,';',1,30125)
LexToken(EOL,'\n',1,30126)
@@ -6853,7 +6871,7 @@ LexToken(EOL,'\n',1,30235)
LexToken(VAR,'xinfo',1,30252)
LexToken(OPENBRACKET,'(',1,30257)
LexToken(DQSTRING,'"Bad address in Y:"',1,30276)
-LexToken(OPERATOR,'+',1,30277)
+LexToken(ADDITION,'+',1,30277)
LexToken(VAR,'y2',1,30278)
LexToken(CLOSEBRACKET,')',1,30280)
LexToken(SEMICOLON,';',1,30281)
@@ -6872,7 +6890,8 @@ LexToken(COMMA,',',1,30345)
LexToken(NUMBER,'1',1,30346)
LexToken(COLON,':',1,30347)
LexToken(VAR,'y2p',1,30348)
-LexToken(NUMBER,'-1',1,30351)
+LexToken(ADDITION,'-',1,30351)
+LexToken(NUMBER,'1',1,30352)
LexToken(CLOSEBRACKET,')',1,30353)
LexToken(SEMICOLON,';',1,30354)
LexToken(EOL,'\n',1,30355)
@@ -6941,7 +6960,7 @@ LexToken(EOL,'\n',1,30595)
LexToken(VAR,'xstC',1,30612)
LexToken(ASSIGNMENT,'=',1,30616)
LexToken(VAR,'xstC',1,30617)
-LexToken(OPERATOR,'+',1,30621)
+LexToken(ADDITION,'+',1,30621)
LexToken(VAR,'modulo',1,30622)
LexToken(OPENBRACKET,'(',1,30628)
LexToken(VAR,'find',1,30629)
@@ -6953,21 +6972,22 @@ LexToken(OPENBRACKET,'(',1,30642)
LexToken(VAR,'x11',1,30643)
LexToken(COMMA,',',1,30646)
LexToken(VAR,'lx11',1,30647)
-LexToken(OPERATOR,'-',1,30651)
+LexToken(ADDITION,'-',1,30651)
LexToken(VAR,'i',1,30652)
-LexToken(OPERATOR,'+',1,30653)
+LexToken(ADDITION,'+',1,30653)
LexToken(NUMBER,'1',1,30654)
LexToken(CLOSEBRACKET,')',1,30655)
LexToken(CLOSEBRACKET,')',1,30656)
LexToken(COMMA,',',1,30657)
LexToken(NUMBER,'26',1,30658)
LexToken(CLOSEBRACKET,')',1,30660)
-LexToken(OPERATOR,'*',1,30661)
+LexToken(MULTIPLICATION,'*',1,30661)
LexToken(NUMBER,'26',1,30662)
-LexToken(OPERATOR,'^',1,30664)
+LexToken(MULTIPLICATION,'^',1,30664)
LexToken(OPENBRACKET,'(',1,30665)
LexToken(VAR,'i',1,30666)
-LexToken(NUMBER,'-1',1,30667)
+LexToken(ADDITION,'-',1,30667)
+LexToken(NUMBER,'1',1,30668)
LexToken(CLOSEBRACKET,')',1,30669)
LexToken(SEMICOLON,';',1,30670)
LexToken(EOL,'\n',1,30671)
@@ -6989,7 +7009,7 @@ LexToken(EOL,'\n',1,30733)
LexToken(VAR,'xenC',1,30750)
LexToken(ASSIGNMENT,'=',1,30754)
LexToken(VAR,'xenC',1,30755)
-LexToken(OPERATOR,'+',1,30759)
+LexToken(ADDITION,'+',1,30759)
LexToken(VAR,'modulo',1,30760)
LexToken(OPENBRACKET,'(',1,30766)
LexToken(VAR,'find',1,30767)
@@ -7001,21 +7021,22 @@ LexToken(OPENBRACKET,'(',1,30780)
LexToken(VAR,'x21',1,30781)
LexToken(COMMA,',',1,30784)
LexToken(VAR,'lx21',1,30785)
-LexToken(OPERATOR,'-',1,30789)
+LexToken(ADDITION,'-',1,30789)
LexToken(VAR,'i',1,30790)
-LexToken(OPERATOR,'+',1,30791)
+LexToken(ADDITION,'+',1,30791)
LexToken(NUMBER,'1',1,30792)
LexToken(CLOSEBRACKET,')',1,30793)
LexToken(CLOSEBRACKET,')',1,30794)
LexToken(COMMA,',',1,30795)
LexToken(NUMBER,'26',1,30796)
LexToken(CLOSEBRACKET,')',1,30798)
-LexToken(OPERATOR,'*',1,30799)
+LexToken(MULTIPLICATION,'*',1,30799)
LexToken(NUMBER,'26',1,30800)
-LexToken(OPERATOR,'^',1,30802)
+LexToken(MULTIPLICATION,'^',1,30802)
LexToken(OPENBRACKET,'(',1,30803)
LexToken(VAR,'i',1,30804)
-LexToken(NUMBER,'-1',1,30805)
+LexToken(ADDITION,'-',1,30805)
+LexToken(NUMBER,'1',1,30806)
LexToken(CLOSEBRACKET,')',1,30807)
LexToken(SEMICOLON,';',1,30808)
LexToken(EOL,'\n',1,30809)
@@ -7037,7 +7058,7 @@ LexToken(EOL,'\n',1,30871)
LexToken(VAR,'ystC',1,30888)
LexToken(ASSIGNMENT,'=',1,30892)
LexToken(VAR,'ystC',1,30893)
-LexToken(OPERATOR,'+',1,30897)
+LexToken(ADDITION,'+',1,30897)
LexToken(VAR,'modulo',1,30898)
LexToken(OPENBRACKET,'(',1,30904)
LexToken(VAR,'find',1,30905)
@@ -7049,21 +7070,22 @@ LexToken(OPENBRACKET,'(',1,30918)
LexToken(VAR,'y11',1,30919)
LexToken(COMMA,',',1,30922)
LexToken(VAR,'ly11',1,30923)
-LexToken(OPERATOR,'-',1,30927)
+LexToken(ADDITION,'-',1,30927)
LexToken(VAR,'i',1,30928)
-LexToken(OPERATOR,'+',1,30929)
+LexToken(ADDITION,'+',1,30929)
LexToken(NUMBER,'1',1,30930)
LexToken(CLOSEBRACKET,')',1,30931)
LexToken(CLOSEBRACKET,')',1,30932)
LexToken(COMMA,',',1,30933)
LexToken(NUMBER,'26',1,30934)
LexToken(CLOSEBRACKET,')',1,30936)
-LexToken(OPERATOR,'*',1,30937)
+LexToken(MULTIPLICATION,'*',1,30937)
LexToken(NUMBER,'26',1,30938)
-LexToken(OPERATOR,'^',1,30940)
+LexToken(MULTIPLICATION,'^',1,30940)
LexToken(OPENBRACKET,'(',1,30941)
LexToken(VAR,'i',1,30942)
-LexToken(NUMBER,'-1',1,30943)
+LexToken(ADDITION,'-',1,30943)
+LexToken(NUMBER,'1',1,30944)
LexToken(CLOSEBRACKET,')',1,30945)
LexToken(SEMICOLON,';',1,30946)
LexToken(EOL,'\n',1,30947)
@@ -7085,7 +7107,7 @@ LexToken(EOL,'\n',1,31009)
LexToken(VAR,'yenC',1,31026)
LexToken(ASSIGNMENT,'=',1,31030)
LexToken(VAR,'yenC',1,31031)
-LexToken(OPERATOR,'+',1,31035)
+LexToken(ADDITION,'+',1,31035)
LexToken(VAR,'modulo',1,31036)
LexToken(OPENBRACKET,'(',1,31042)
LexToken(VAR,'find',1,31043)
@@ -7097,21 +7119,22 @@ LexToken(OPENBRACKET,'(',1,31056)
LexToken(VAR,'y21',1,31057)
LexToken(COMMA,',',1,31060)
LexToken(VAR,'ly21',1,31061)
-LexToken(OPERATOR,'-',1,31065)
+LexToken(ADDITION,'-',1,31065)
LexToken(VAR,'i',1,31066)
-LexToken(OPERATOR,'+',1,31067)
+LexToken(ADDITION,'+',1,31067)
LexToken(NUMBER,'1',1,31068)
LexToken(CLOSEBRACKET,')',1,31069)
LexToken(CLOSEBRACKET,')',1,31070)
LexToken(COMMA,',',1,31071)
LexToken(NUMBER,'26',1,31072)
LexToken(CLOSEBRACKET,')',1,31074)
-LexToken(OPERATOR,'*',1,31075)
+LexToken(MULTIPLICATION,'*',1,31075)
LexToken(NUMBER,'26',1,31076)
-LexToken(OPERATOR,'^',1,31078)
+LexToken(MULTIPLICATION,'^',1,31078)
LexToken(OPENBRACKET,'(',1,31079)
LexToken(VAR,'i',1,31080)
-LexToken(NUMBER,'-1',1,31081)
+LexToken(ADDITION,'-',1,31081)
+LexToken(NUMBER,'1',1,31082)
LexToken(CLOSEBRACKET,')',1,31083)
LexToken(SEMICOLON,';',1,31084)
LexToken(EOL,'\n',1,31085)
@@ -7417,7 +7440,7 @@ LexToken(EOL,'\n',1,32078)
LexToken(VAR,'xinfo',1,32091)
LexToken(OPENBRACKET,'(',1,32096)
LexToken(DQSTRING,'" Scicos cannot read your Excel file, please verify"',1,32148)
-LexToken(OPERATOR,'+',1,32149)
+LexToken(ADDITION,'+',1,32149)
LexToken(DQSTRING,'" the parameters "',1,32183)
LexToken(CLOSEBRACKET,')',1,32184)
LexToken(SEMICOLON,';',1,32185)
@@ -7545,12 +7568,12 @@ LexToken(EOL,'\n',1,32569)
LexToken(VAR,'xinfo',1,32582)
LexToken(OPENBRACKET,'(',1,32587)
LexToken(DQSTRING,'"x contains no data:x("',1,32610)
-LexToken(OPERATOR,'+',1,32611)
+LexToken(ADDITION,'+',1,32611)
LexToken(VAR,'string',1,32612)
LexToken(OPENBRACKET,'(',1,32618)
LexToken(VAR,'i',1,32619)
LexToken(CLOSEBRACKET,')',1,32620)
-LexToken(OPERATOR,'+',1,32621)
+LexToken(ADDITION,'+',1,32621)
LexToken(DQSTRING,'")"',1,32624)
LexToken(CLOSEBRACKET,')',1,32625)
LexToken(SEMICOLON,';',1,32626)
@@ -7577,12 +7600,12 @@ LexToken(EOL,'\n',1,32690)
LexToken(VAR,'xinfo',1,32703)
LexToken(OPENBRACKET,'(',1,32708)
LexToken(DQSTRING,'"Y contains no data:y("',1,32731)
-LexToken(OPERATOR,'+',1,32732)
+LexToken(ADDITION,'+',1,32732)
LexToken(VAR,'string',1,32733)
LexToken(OPENBRACKET,'(',1,32739)
LexToken(VAR,'i',1,32740)
LexToken(CLOSEBRACKET,')',1,32741)
-LexToken(OPERATOR,'+',1,32742)
+LexToken(ADDITION,'+',1,32742)
LexToken(DQSTRING,'")"',1,32745)
LexToken(CLOSEBRACKET,')',1,32746)
LexToken(SEMICOLON,';',1,32747)
@@ -7638,7 +7661,7 @@ LexToken(EOL,'\n',1,32884)
LexToken(VAR,'xe',1,32893)
LexToken(OPENBRACKET,'(',1,32895)
LexToken(LASTINDEX,'$',1,32896)
-LexToken(OPERATOR,'+',1,32897)
+LexToken(ADDITION,'+',1,32897)
LexToken(NUMBER,'1',1,32898)
LexToken(CLOSEBRACKET,')',1,32899)
LexToken(ASSIGNMENT,'=',1,32900)
@@ -7648,7 +7671,7 @@ LexToken(EOL,'\n',1,32903)
LexToken(VAR,'ye',1,32912)
LexToken(OPENBRACKET,'(',1,32914)
LexToken(LASTINDEX,'$',1,32915)
-LexToken(OPERATOR,'+',1,32916)
+LexToken(ADDITION,'+',1,32916)
LexToken(NUMBER,'1',1,32917)
LexToken(CLOSEBRACKET,')',1,32918)
LexToken(ASSIGNMENT,'=',1,32919)
@@ -7933,13 +7956,13 @@ LexToken(OPENSQBRACKET,'[',1,34048)
LexToken(DQSTRING,'"Filename"',1,34058)
LexToken(SEMICOLON,';',1,34059)
LexToken(DQSTRING,'"Reading [C] f"',1,34074)
-LexToken(OPERATOR,'+',1,34075)
+LexToken(ADDITION,'+',1,34075)
LexToken(DQSTRING,'"ormat"',1,34094)
LexToken(SEMICOLON,';',1,34095)
LexToken(DQSTRING,'"Abscissa column"',1,34112)
LexToken(SEMICOLON,';',1,34113)
LexToken(DQSTRING,'"Output"',1,34121)
-LexToken(OPERATOR,'+',1,34122)
+LexToken(ADDITION,'+',1,34122)
LexToken(DQSTRING,'" column"',1,34143)
LexToken(CLOSESQBRACKET,']',1,34144)
LexToken(COMMA,',',1,34145)
@@ -8059,7 +8082,8 @@ LexToken(VAR,'Lx',1,34558)
LexToken(ASSIGNMENT,'=',1,34560)
LexToken(VAR,'mfscanf',1,34561)
LexToken(OPENBRACKET,'(',1,34568)
-LexToken(NUMBER,'-1',1,34569)
+LexToken(ADDITION,'-',1,34569)
+LexToken(NUMBER,'1',1,34570)
LexToken(COMMA,',',1,34571)
LexToken(VAR,'fd',1,34572)
LexToken(COMMA,',',1,34574)
@@ -8078,7 +8102,7 @@ LexToken(EOL,'\n',1,34622)
LexToken(VAR,'xinfo',1,34635)
LexToken(OPENBRACKET,'(',1,34640)
LexToken(DQSTRING,'"Scicos cannot open the data file: "',1,34676)
-LexToken(OPERATOR,'+',1,34678)
+LexToken(ADDITION,'+',1,34678)
LexToken(VAR,'filen',1,34680)
LexToken(CLOSEBRACKET,')',1,34685)
LexToken(SEMICOLON,';',1,34686)
@@ -8263,7 +8287,7 @@ LexToken(OPENSQBRACKET,'[',1,35317)
LexToken(DQSTRING,'"Filename"',1,35327)
LexToken(SEMICOLON,';',1,35328)
LexToken(DQSTRING,'"Writing [C] f"',1,35343)
-LexToken(OPERATOR,'+',1,35344)
+LexToken(ADDITION,'+',1,35344)
LexToken(DQSTRING,'"ormat"',1,35363)
LexToken(CLOSESQBRACKET,']',1,35364)
LexToken(COMMA,',',1,35365)
@@ -8348,7 +8372,7 @@ LexToken(EOL,'\n',1,35677)
LexToken(VAR,'Cformat',1,35686)
LexToken(ASSIGNMENT,'=',1,35693)
LexToken(VAR,'Cformat',1,35694)
-LexToken(OPERATOR,'+',1,35701)
+LexToken(ADDITION,'+',1,35701)
LexToken(DQSTRING,'"\\n"',1,35705)
LexToken(SEMICOLON,';',1,35706)
LexToken(EOL,'\n',1,35707)
@@ -8388,7 +8412,7 @@ LexToken(EOL,'\n',1,35831)
LexToken(VAR,'xinfo',1,35844)
LexToken(OPENBRACKET,'(',1,35849)
LexToken(DQSTRING,'"Scicos cannot open the data file:"',1,35884)
-LexToken(OPERATOR,'+',1,35885)
+LexToken(ADDITION,'+',1,35885)
LexToken(VAR,'filen',1,35886)
LexToken(CLOSEBRACKET,')',1,35891)
LexToken(SEMICOLON,';',1,35892)
@@ -8490,7 +8514,8 @@ LexToken(ASSIGNMENT,'=',1,36226)
LexToken(NUMBER,'1',1,36227)
LexToken(COLON,':',1,36228)
LexToken(VAR,'N',1,36229)
-LexToken(NUMBER,'-1',1,36230)
+LexToken(ADDITION,'-',1,36230)
+LexToken(NUMBER,'1',1,36231)
LexToken(EOL,'\n',1,36232)
LexToken(VAR,'X',1,36245)
LexToken(ASSIGNMENT,'=',1,36246)
@@ -8505,14 +8530,14 @@ LexToken(SEMICOLON,';',1,36254)
LexToken(VAR,'x',1,36255)
LexToken(OPENBRACKET,'(',1,36256)
LexToken(VAR,'i',1,36257)
-LexToken(OPERATOR,'+',1,36258)
+LexToken(ADDITION,'+',1,36258)
LexToken(NUMBER,'1',1,36259)
LexToken(CLOSEBRACKET,')',1,36260)
LexToken(SEMICOLON,';',1,36261)
LexToken(VAR,'x',1,36262)
LexToken(OPENBRACKET,'(',1,36263)
LexToken(VAR,'i',1,36264)
-LexToken(OPERATOR,'+',1,36265)
+LexToken(ADDITION,'+',1,36265)
LexToken(NUMBER,'1',1,36266)
LexToken(CLOSEBRACKET,')',1,36267)
LexToken(CLOSESQBRACKET,']',1,36268)
@@ -8536,7 +8561,7 @@ LexToken(SEMICOLON,';',1,36297)
LexToken(VAR,'y',1,36298)
LexToken(OPENBRACKET,'(',1,36299)
LexToken(VAR,'i',1,36300)
-LexToken(OPERATOR,'+',1,36301)
+LexToken(ADDITION,'+',1,36301)
LexToken(NUMBER,'1',1,36302)
LexToken(CLOSEBRACKET,')',1,36303)
LexToken(CLOSESQBRACKET,']',1,36304)
@@ -8683,7 +8708,8 @@ LexToken(ASSIGNMENT,'=',1,36923)
LexToken(NUMBER,'1',1,36924)
LexToken(COLON,':',1,36925)
LexToken(VAR,'N',1,36926)
-LexToken(NUMBER,'-1',1,36927)
+LexToken(ADDITION,'-',1,36927)
+LexToken(NUMBER,'1',1,36928)
LexToken(EOL,'\n',1,36929)
LexToken(VAR,'X',1,36938)
LexToken(ASSIGNMENT,'=',1,36939)
@@ -8700,12 +8726,12 @@ LexToken(COMMA,',',1,36956)
LexToken(VAR,'x',1,36957)
LexToken(OPENBRACKET,'(',1,36958)
LexToken(VAR,'i',1,36959)
-LexToken(OPERATOR,'+',1,36960)
+LexToken(ADDITION,'+',1,36960)
LexToken(NUMBER,'1',1,36961)
LexToken(CLOSEBRACKET,')',1,36962)
LexToken(COMMA,',',1,36963)
LexToken(VAR,'NP',1,36964)
-LexToken(OPERATOR,'+',1,36966)
+LexToken(ADDITION,'+',1,36966)
LexToken(NUMBER,'2',1,36967)
LexToken(CLOSEBRACKET,')',1,36968)
LexToken(TRANSPOSE,"'",1,36969)
@@ -8746,7 +8772,8 @@ LexToken(OPENBRACKET,'(',1,37147)
LexToken(NUMBER,'1',1,37148)
LexToken(COLON,':',1,37149)
LexToken(VAR,'N',1,37150)
-LexToken(NUMBER,'-1',1,37151)
+LexToken(ADDITION,'-',1,37151)
+LexToken(NUMBER,'1',1,37152)
LexToken(CLOSEBRACKET,')',1,37153)
LexToken(SEMICOLON,';',1,37154)
LexToken(EOL,'\n',1,37155)
@@ -8757,9 +8784,10 @@ LexToken(OPENBRACKET,'(',1,37167)
LexToken(VAR,'N',1,37168)
LexToken(COLON,':',1,37169)
LexToken(NUMBER,'2',1,37170)
-LexToken(OPERATOR,'*',1,37171)
+LexToken(MULTIPLICATION,'*',1,37171)
LexToken(VAR,'N',1,37172)
-LexToken(NUMBER,'-2',1,37173)
+LexToken(ADDITION,'-',1,37173)
+LexToken(NUMBER,'2',1,37174)
LexToken(CLOSEBRACKET,')',1,37175)
LexToken(SEMICOLON,';',1,37176)
LexToken(EOL,'\n',1,37177)
@@ -8768,14 +8796,16 @@ LexToken(ASSIGNMENT,'=',1,37187)
LexToken(VAR,'Z',1,37188)
LexToken(OPENBRACKET,'(',1,37189)
LexToken(NUMBER,'2',1,37190)
-LexToken(OPERATOR,'*',1,37191)
+LexToken(MULTIPLICATION,'*',1,37191)
LexToken(VAR,'N',1,37192)
-LexToken(NUMBER,'-1',1,37193)
+LexToken(ADDITION,'-',1,37193)
+LexToken(NUMBER,'1',1,37194)
LexToken(COLON,':',1,37195)
LexToken(NUMBER,'3',1,37196)
-LexToken(OPERATOR,'*',1,37197)
+LexToken(MULTIPLICATION,'*',1,37197)
LexToken(VAR,'N',1,37198)
-LexToken(NUMBER,'-3',1,37199)
+LexToken(ADDITION,'-',1,37199)
+LexToken(NUMBER,'3',1,37200)
LexToken(CLOSEBRACKET,')',1,37201)
LexToken(SEMICOLON,';',1,37202)
LexToken(EOL,'\n',1,37203)
@@ -8796,9 +8826,11 @@ LexToken(FOR,'for',1,37245)
LexToken(VAR,'i',1,37249)
LexToken(ASSIGNMENT,'=',1,37250)
LexToken(VAR,'N',1,37251)
-LexToken(NUMBER,'-1',1,37252)
+LexToken(ADDITION,'-',1,37252)
+LexToken(NUMBER,'1',1,37253)
LexToken(COLON,':',1,37254)
-LexToken(NUMBER,'-1',1,37255)
+LexToken(ADDITION,'-',1,37255)
+LexToken(NUMBER,'1',1,37256)
LexToken(COLON,':',1,37257)
LexToken(NUMBER,'1',1,37258)
LexToken(EOL,'\n',1,37259)
@@ -8831,38 +8863,38 @@ LexToken(VAR,'A',1,37376)
LexToken(OPENBRACKET,'(',1,37377)
LexToken(VAR,'i',1,37378)
LexToken(CLOSEBRACKET,')',1,37379)
-LexToken(OPERATOR,'*',1,37380)
+LexToken(MULTIPLICATION,'*',1,37380)
LexToken(OPENBRACKET,'(',1,37381)
LexToken(VAR,'X',1,37382)
LexToken(OPENBRACKET,'(',1,37383)
LexToken(VAR,'j',1,37384)
LexToken(CLOSEBRACKET,')',1,37385)
-LexToken(OPERATOR,'-',1,37386)
+LexToken(ADDITION,'-',1,37386)
LexToken(VAR,'x',1,37387)
LexToken(OPENBRACKET,'(',1,37388)
LexToken(VAR,'i',1,37389)
LexToken(CLOSEBRACKET,')',1,37390)
LexToken(CLOSEBRACKET,')',1,37391)
-LexToken(OPERATOR,'^',1,37392)
+LexToken(MULTIPLICATION,'^',1,37392)
LexToken(NUMBER,'2',1,37393)
-LexToken(OPERATOR,'+',1,37394)
+LexToken(ADDITION,'+',1,37394)
LexToken(VAR,'B',1,37395)
LexToken(OPENBRACKET,'(',1,37396)
LexToken(VAR,'i',1,37397)
LexToken(CLOSEBRACKET,')',1,37398)
-LexToken(OPERATOR,'*',1,37399)
+LexToken(MULTIPLICATION,'*',1,37399)
LexToken(OPENBRACKET,'(',1,37400)
LexToken(VAR,'X',1,37401)
LexToken(OPENBRACKET,'(',1,37402)
LexToken(VAR,'j',1,37403)
LexToken(CLOSEBRACKET,')',1,37404)
-LexToken(OPERATOR,'-',1,37405)
+LexToken(ADDITION,'-',1,37405)
LexToken(VAR,'x',1,37406)
LexToken(OPENBRACKET,'(',1,37407)
LexToken(VAR,'i',1,37408)
LexToken(CLOSEBRACKET,')',1,37409)
LexToken(CLOSEBRACKET,')',1,37410)
-LexToken(OPERATOR,'+',1,37411)
+LexToken(ADDITION,'+',1,37411)
LexToken(VAR,'C',1,37412)
LexToken(OPENBRACKET,'(',1,37413)
LexToken(VAR,'i',1,37414)
@@ -8877,7 +8909,8 @@ LexToken(VAR,'matrix',1,37444)
LexToken(OPENBRACKET,'(',1,37450)
LexToken(VAR,'Z',1,37451)
LexToken(COMMA,',',1,37452)
-LexToken(NUMBER,'-1',1,37453)
+LexToken(ADDITION,'-',1,37453)
+LexToken(NUMBER,'1',1,37454)
LexToken(COMMA,',',1,37455)
LexToken(NUMBER,'1',1,37456)
LexToken(CLOSEBRACKET,')',1,37457)
@@ -8934,7 +8967,7 @@ LexToken(EOL,'\n',1,37671)
LexToken(VAR,'xinfo',1,37684)
LexToken(OPENBRACKET,'(',1,37689)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,37708)
-LexToken(OPERATOR,'+',1,37709)
+LexToken(ADDITION,'+',1,37709)
LexToken(VAR,'METHOD',1,37710)
LexToken(CLOSEBRACKET,')',1,37716)
LexToken(EOL,'\n',1,37717)
@@ -9017,7 +9050,7 @@ LexToken(EOL,'\n',1,38001)
LexToken(VAR,'xinfo',1,38014)
LexToken(OPENBRACKET,'(',1,38019)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38038)
-LexToken(OPERATOR,'+',1,38039)
+LexToken(ADDITION,'+',1,38039)
LexToken(VAR,'METHOD',1,38040)
LexToken(CLOSEBRACKET,')',1,38046)
LexToken(EOL,'\n',1,38047)
@@ -9075,7 +9108,7 @@ LexToken(EOL,'\n',1,38271)
LexToken(VAR,'xinfo',1,38284)
LexToken(OPENBRACKET,'(',1,38289)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38308)
-LexToken(OPERATOR,'+',1,38309)
+LexToken(ADDITION,'+',1,38309)
LexToken(VAR,'METHOD',1,38310)
LexToken(CLOSEBRACKET,')',1,38316)
LexToken(EOL,'\n',1,38317)
@@ -9134,7 +9167,7 @@ LexToken(EOL,'\n',1,38537)
LexToken(VAR,'xinfo',1,38550)
LexToken(OPENBRACKET,'(',1,38555)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38575)
-LexToken(OPERATOR,'+',1,38576)
+LexToken(ADDITION,'+',1,38576)
LexToken(VAR,'METHOD',1,38577)
LexToken(CLOSEBRACKET,')',1,38583)
LexToken(EOL,'\n',1,38584)
@@ -9198,7 +9231,7 @@ LexToken(EOL,'\n',1,38812)
LexToken(VAR,'xinfo',1,38825)
LexToken(OPENBRACKET,'(',1,38830)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38849)
-LexToken(OPERATOR,'+',1,38850)
+LexToken(ADDITION,'+',1,38850)
LexToken(VAR,'METHOD',1,38851)
LexToken(CLOSEBRACKET,')',1,38857)
LexToken(EOL,'\n',1,38858)
@@ -9230,7 +9263,8 @@ LexToken(VAR,'x',1,38980)
LexToken(COMMA,',',1,38981)
LexToken(DQSTRING,'"*"',1,38984)
LexToken(CLOSEBRACKET,')',1,38985)
-LexToken(NUMBER,'-1',1,38986)
+LexToken(ADDITION,'-',1,38986)
+LexToken(NUMBER,'1',1,38987)
LexToken(SEMICOLON,';',1,38988)
LexToken(EOL,'\n',1,38989)
LexToken(VAR,'A',1,38994)
@@ -9238,12 +9272,13 @@ LexToken(ASSIGNMENT,'=',1,38995)
LexToken(VAR,'zeros',1,38996)
LexToken(OPENBRACKET,'(',1,39001)
LexToken(NUMBER,'3',1,39002)
-LexToken(OPERATOR,'*',1,39003)
+LexToken(MULTIPLICATION,'*',1,39003)
LexToken(VAR,'N',1,39004)
-LexToken(NUMBER,'-1',1,39005)
+LexToken(ADDITION,'-',1,39005)
+LexToken(NUMBER,'1',1,39006)
LexToken(COMMA,',',1,39007)
LexToken(VAR,'N',1,39008)
-LexToken(OPERATOR,'*',1,39009)
+LexToken(MULTIPLICATION,'*',1,39009)
LexToken(NUMBER,'3',1,39010)
LexToken(CLOSEBRACKET,')',1,39011)
LexToken(SEMICOLON,';',1,39012)
@@ -9253,9 +9288,10 @@ LexToken(ASSIGNMENT,'=',1,39019)
LexToken(VAR,'zeros',1,39020)
LexToken(OPENBRACKET,'(',1,39025)
LexToken(NUMBER,'3',1,39026)
-LexToken(OPERATOR,'*',1,39027)
+LexToken(MULTIPLICATION,'*',1,39027)
LexToken(VAR,'N',1,39028)
-LexToken(NUMBER,'-1',1,39029)
+LexToken(ADDITION,'-',1,39029)
+LexToken(NUMBER,'1',1,39030)
LexToken(COMMA,',',1,39031)
LexToken(NUMBER,'1',1,39032)
LexToken(CLOSEBRACKET,')',1,39033)
@@ -9271,12 +9307,13 @@ LexToken(EOL,'\n',1,39049)
LexToken(VAR,'j',1,39058)
LexToken(ASSIGNMENT,'=',1,39059)
LexToken(NUMBER,'3',1,39060)
-LexToken(OPERATOR,'*',1,39061)
+LexToken(MULTIPLICATION,'*',1,39061)
LexToken(OPENBRACKET,'(',1,39062)
LexToken(VAR,'i',1,39063)
-LexToken(NUMBER,'-1',1,39064)
+LexToken(ADDITION,'-',1,39064)
+LexToken(NUMBER,'1',1,39065)
LexToken(CLOSEBRACKET,')',1,39066)
-LexToken(OPERATOR,'+',1,39067)
+LexToken(ADDITION,'+',1,39067)
LexToken(NUMBER,'1',1,39068)
LexToken(SEMICOLON,';',1,39069)
LexToken(EOL,'\n',1,39070)
@@ -9285,9 +9322,9 @@ LexToken(OPENBRACKET,'(',1,39080)
LexToken(VAR,'j',1,39081)
LexToken(COMMA,',',1,39082)
LexToken(VAR,'i',1,39083)
-LexToken(OPERATOR,'+',1,39084)
+LexToken(ADDITION,'+',1,39084)
LexToken(NUMBER,'2',1,39085)
-LexToken(OPERATOR,'*',1,39086)
+LexToken(MULTIPLICATION,'*',1,39086)
LexToken(VAR,'N',1,39087)
LexToken(CLOSEBRACKET,')',1,39088)
LexToken(ASSIGNMENT,'=',1,39089)
@@ -9308,7 +9345,7 @@ LexToken(EOL,'\n',1,39111)
LexToken(VAR,'A',1,39120)
LexToken(OPENBRACKET,'(',1,39121)
LexToken(VAR,'j',1,39122)
-LexToken(OPERATOR,'+',1,39123)
+LexToken(ADDITION,'+',1,39123)
LexToken(NUMBER,'1',1,39124)
LexToken(COMMA,',',1,39125)
LexToken(VAR,'i',1,39126)
@@ -9318,37 +9355,37 @@ LexToken(OPENBRACKET,'(',1,39129)
LexToken(VAR,'x',1,39130)
LexToken(OPENBRACKET,'(',1,39131)
LexToken(VAR,'i',1,39132)
-LexToken(OPERATOR,'+',1,39133)
+LexToken(ADDITION,'+',1,39133)
LexToken(NUMBER,'1',1,39134)
LexToken(CLOSEBRACKET,')',1,39135)
-LexToken(OPERATOR,'-',1,39136)
+LexToken(ADDITION,'-',1,39136)
LexToken(VAR,'x',1,39137)
LexToken(OPENBRACKET,'(',1,39138)
LexToken(VAR,'i',1,39139)
LexToken(CLOSEBRACKET,')',1,39140)
LexToken(CLOSEBRACKET,')',1,39141)
-LexToken(OPERATOR,'^',1,39142)
+LexToken(MULTIPLICATION,'^',1,39142)
LexToken(NUMBER,'2',1,39143)
LexToken(SEMICOLON,';',1,39144)
LexToken(EOL,'\n',1,39145)
LexToken(VAR,'A',1,39154)
LexToken(OPENBRACKET,'(',1,39155)
LexToken(VAR,'j',1,39156)
-LexToken(OPERATOR,'+',1,39157)
+LexToken(ADDITION,'+',1,39157)
LexToken(NUMBER,'1',1,39158)
LexToken(COMMA,',',1,39159)
LexToken(VAR,'i',1,39160)
-LexToken(OPERATOR,'+',1,39161)
+LexToken(ADDITION,'+',1,39161)
LexToken(VAR,'N',1,39162)
LexToken(CLOSEBRACKET,')',1,39163)
LexToken(ASSIGNMENT,'=',1,39164)
LexToken(VAR,'x',1,39165)
LexToken(OPENBRACKET,'(',1,39166)
LexToken(VAR,'i',1,39167)
-LexToken(OPERATOR,'+',1,39168)
+LexToken(ADDITION,'+',1,39168)
LexToken(NUMBER,'1',1,39169)
LexToken(CLOSEBRACKET,')',1,39170)
-LexToken(OPERATOR,'-',1,39171)
+LexToken(ADDITION,'-',1,39171)
LexToken(VAR,'x',1,39172)
LexToken(OPENBRACKET,'(',1,39173)
LexToken(VAR,'i',1,39174)
@@ -9358,13 +9395,13 @@ LexToken(EOL,'\n',1,39177)
LexToken(VAR,'A',1,39186)
LexToken(OPENBRACKET,'(',1,39187)
LexToken(VAR,'j',1,39188)
-LexToken(OPERATOR,'+',1,39189)
+LexToken(ADDITION,'+',1,39189)
LexToken(NUMBER,'1',1,39190)
LexToken(COMMA,',',1,39191)
LexToken(VAR,'i',1,39192)
-LexToken(OPERATOR,'+',1,39193)
+LexToken(ADDITION,'+',1,39193)
LexToken(NUMBER,'2',1,39194)
-LexToken(OPERATOR,'*',1,39195)
+LexToken(MULTIPLICATION,'*',1,39195)
LexToken(VAR,'N',1,39196)
LexToken(CLOSEBRACKET,')',1,39197)
LexToken(ASSIGNMENT,'=',1,39198)
@@ -9374,14 +9411,14 @@ LexToken(EOL,'\n',1,39201)
LexToken(VAR,'B',1,39210)
LexToken(OPENBRACKET,'(',1,39211)
LexToken(VAR,'j',1,39212)
-LexToken(OPERATOR,'+',1,39213)
+LexToken(ADDITION,'+',1,39213)
LexToken(NUMBER,'1',1,39214)
LexToken(CLOSEBRACKET,')',1,39215)
LexToken(ASSIGNMENT,'=',1,39216)
LexToken(VAR,'y',1,39217)
LexToken(OPENBRACKET,'(',1,39218)
LexToken(VAR,'i',1,39219)
-LexToken(OPERATOR,'+',1,39220)
+LexToken(ADDITION,'+',1,39220)
LexToken(NUMBER,'1',1,39221)
LexToken(CLOSEBRACKET,')',1,39222)
LexToken(SEMICOLON,';',1,39223)
@@ -9395,39 +9432,41 @@ LexToken(ASSIGNMENT,'=',1,39243)
LexToken(NUMBER,'1',1,39244)
LexToken(COLON,':',1,39245)
LexToken(VAR,'N',1,39246)
-LexToken(NUMBER,'-1',1,39247)
+LexToken(ADDITION,'-',1,39247)
+LexToken(NUMBER,'1',1,39248)
LexToken(EOL,'\n',1,39249)
LexToken(VAR,'j',1,39258)
LexToken(ASSIGNMENT,'=',1,39259)
LexToken(NUMBER,'3',1,39260)
-LexToken(OPERATOR,'*',1,39261)
+LexToken(MULTIPLICATION,'*',1,39261)
LexToken(OPENBRACKET,'(',1,39262)
LexToken(VAR,'i',1,39263)
-LexToken(NUMBER,'-1',1,39264)
+LexToken(ADDITION,'-',1,39264)
+LexToken(NUMBER,'1',1,39265)
LexToken(CLOSEBRACKET,')',1,39266)
-LexToken(OPERATOR,'+',1,39267)
+LexToken(ADDITION,'+',1,39267)
LexToken(NUMBER,'1',1,39268)
LexToken(SEMICOLON,';',1,39269)
LexToken(EOL,'\n',1,39270)
LexToken(VAR,'A',1,39279)
LexToken(OPENBRACKET,'(',1,39280)
LexToken(VAR,'j',1,39281)
-LexToken(OPERATOR,'+',1,39282)
+LexToken(ADDITION,'+',1,39282)
LexToken(NUMBER,'2',1,39283)
LexToken(COMMA,',',1,39284)
LexToken(VAR,'i',1,39285)
LexToken(CLOSEBRACKET,')',1,39286)
LexToken(ASSIGNMENT,'=',1,39287)
LexToken(NUMBER,'2',1,39288)
-LexToken(OPERATOR,'*',1,39289)
+LexToken(MULTIPLICATION,'*',1,39289)
LexToken(OPENBRACKET,'(',1,39290)
LexToken(VAR,'x',1,39291)
LexToken(OPENBRACKET,'(',1,39292)
LexToken(VAR,'i',1,39293)
-LexToken(OPERATOR,'+',1,39294)
+LexToken(ADDITION,'+',1,39294)
LexToken(NUMBER,'1',1,39295)
LexToken(CLOSEBRACKET,')',1,39296)
-LexToken(OPERATOR,'-',1,39297)
+LexToken(ADDITION,'-',1,39297)
LexToken(VAR,'x',1,39298)
LexToken(OPENBRACKET,'(',1,39299)
LexToken(VAR,'i',1,39300)
@@ -9438,11 +9477,11 @@ LexToken(EOL,'\n',1,39304)
LexToken(VAR,'A',1,39313)
LexToken(OPENBRACKET,'(',1,39314)
LexToken(VAR,'j',1,39315)
-LexToken(OPERATOR,'+',1,39316)
+LexToken(ADDITION,'+',1,39316)
LexToken(NUMBER,'2',1,39317)
LexToken(COMMA,',',1,39318)
LexToken(VAR,'i',1,39319)
-LexToken(OPERATOR,'+',1,39320)
+LexToken(ADDITION,'+',1,39320)
LexToken(VAR,'N',1,39321)
LexToken(CLOSEBRACKET,')',1,39322)
LexToken(ASSIGNMENT,'=',1,39323)
@@ -9452,17 +9491,18 @@ LexToken(EOL,'\n',1,39326)
LexToken(VAR,'A',1,39335)
LexToken(OPENBRACKET,'(',1,39336)
LexToken(VAR,'j',1,39337)
-LexToken(OPERATOR,'+',1,39338)
+LexToken(ADDITION,'+',1,39338)
LexToken(NUMBER,'2',1,39339)
LexToken(COMMA,',',1,39340)
LexToken(VAR,'i',1,39341)
-LexToken(OPERATOR,'+',1,39342)
+LexToken(ADDITION,'+',1,39342)
LexToken(VAR,'N',1,39343)
-LexToken(OPERATOR,'+',1,39344)
+LexToken(ADDITION,'+',1,39344)
LexToken(NUMBER,'1',1,39345)
LexToken(CLOSEBRACKET,')',1,39346)
LexToken(ASSIGNMENT,'=',1,39347)
-LexToken(NUMBER,'-1',1,39348)
+LexToken(ADDITION,'-',1,39348)
+LexToken(NUMBER,'1',1,39349)
LexToken(SEMICOLON,';',1,39350)
LexToken(EOL,'\n',1,39351)
LexToken(END,'end',1,39356)
@@ -9473,11 +9513,11 @@ LexToken(ASSIGNMENT,'=',1,39366)
LexToken(VAR,'zeros',1,39367)
LexToken(OPENBRACKET,'(',1,39372)
LexToken(NUMBER,'3',1,39373)
-LexToken(OPERATOR,'*',1,39374)
+LexToken(MULTIPLICATION,'*',1,39374)
LexToken(VAR,'N',1,39375)
LexToken(COMMA,',',1,39376)
LexToken(NUMBER,'3',1,39377)
-LexToken(OPERATOR,'*',1,39378)
+LexToken(MULTIPLICATION,'*',1,39378)
LexToken(VAR,'N',1,39379)
LexToken(CLOSEBRACKET,')',1,39380)
LexToken(SEMICOLON,';',1,39381)
@@ -9497,21 +9537,21 @@ LexToken(VAR,'i',1,39409)
LexToken(CLOSEBRACKET,')',1,39410)
LexToken(ASSIGNMENT,'=',1,39411)
LexToken(NUMBER,'4',1,39412)
-LexToken(OPERATOR,'*',1,39413)
+LexToken(MULTIPLICATION,'*',1,39413)
LexToken(OPENBRACKET,'(',1,39414)
LexToken(VAR,'x',1,39415)
LexToken(OPENBRACKET,'(',1,39416)
LexToken(VAR,'i',1,39417)
-LexToken(OPERATOR,'+',1,39418)
+LexToken(ADDITION,'+',1,39418)
LexToken(NUMBER,'1',1,39419)
LexToken(CLOSEBRACKET,')',1,39420)
-LexToken(OPERATOR,'-',1,39421)
+LexToken(ADDITION,'-',1,39421)
LexToken(VAR,'x',1,39422)
LexToken(OPENBRACKET,'(',1,39423)
LexToken(VAR,'i',1,39424)
LexToken(CLOSEBRACKET,')',1,39425)
LexToken(CLOSEBRACKET,')',1,39426)
-LexToken(OPERATOR,'^',1,39427)
+LexToken(MULTIPLICATION,'^',1,39427)
LexToken(NUMBER,'2',1,39428)
LexToken(EOL,'\n',1,39429)
LexToken(VAR,'Q',1,39438)
@@ -9519,20 +9559,20 @@ LexToken(OPENBRACKET,'(',1,39439)
LexToken(VAR,'i',1,39440)
LexToken(COMMA,',',1,39441)
LexToken(VAR,'i',1,39442)
-LexToken(OPERATOR,'+',1,39443)
+LexToken(ADDITION,'+',1,39443)
LexToken(VAR,'N',1,39444)
LexToken(CLOSEBRACKET,')',1,39445)
LexToken(ASSIGNMENT,'=',1,39446)
LexToken(NUMBER,'2',1,39447)
-LexToken(OPERATOR,'*',1,39448)
+LexToken(MULTIPLICATION,'*',1,39448)
LexToken(OPENBRACKET,'(',1,39449)
LexToken(VAR,'x',1,39450)
LexToken(OPENBRACKET,'(',1,39451)
LexToken(VAR,'i',1,39452)
-LexToken(OPERATOR,'+',1,39453)
+LexToken(ADDITION,'+',1,39453)
LexToken(NUMBER,'1',1,39454)
LexToken(CLOSEBRACKET,')',1,39455)
-LexToken(OPERATOR,'-',1,39456)
+LexToken(ADDITION,'-',1,39456)
LexToken(VAR,'x',1,39457)
LexToken(OPENBRACKET,'(',1,39458)
LexToken(VAR,'i',1,39459)
@@ -9542,22 +9582,22 @@ LexToken(EOL,'\n',1,39462)
LexToken(VAR,'Q',1,39471)
LexToken(OPENBRACKET,'(',1,39472)
LexToken(VAR,'i',1,39473)
-LexToken(OPERATOR,'+',1,39474)
+LexToken(ADDITION,'+',1,39474)
LexToken(VAR,'N',1,39475)
LexToken(COMMA,',',1,39476)
LexToken(VAR,'i',1,39477)
LexToken(CLOSEBRACKET,')',1,39478)
LexToken(ASSIGNMENT,'=',1,39479)
LexToken(NUMBER,'2',1,39480)
-LexToken(OPERATOR,'*',1,39481)
+LexToken(MULTIPLICATION,'*',1,39481)
LexToken(OPENBRACKET,'(',1,39482)
LexToken(VAR,'x',1,39483)
LexToken(OPENBRACKET,'(',1,39484)
LexToken(VAR,'i',1,39485)
-LexToken(OPERATOR,'+',1,39486)
+LexToken(ADDITION,'+',1,39486)
LexToken(NUMBER,'1',1,39487)
LexToken(CLOSEBRACKET,')',1,39488)
-LexToken(OPERATOR,'-',1,39489)
+LexToken(ADDITION,'-',1,39489)
LexToken(VAR,'x',1,39490)
LexToken(OPENBRACKET,'(',1,39491)
LexToken(VAR,'i',1,39492)
@@ -9567,11 +9607,11 @@ LexToken(EOL,'\n',1,39495)
LexToken(VAR,'Q',1,39504)
LexToken(OPENBRACKET,'(',1,39505)
LexToken(VAR,'i',1,39506)
-LexToken(OPERATOR,'+',1,39507)
+LexToken(ADDITION,'+',1,39507)
LexToken(VAR,'N',1,39508)
LexToken(COMMA,',',1,39509)
LexToken(VAR,'i',1,39510)
-LexToken(OPERATOR,'+',1,39511)
+LexToken(ADDITION,'+',1,39511)
LexToken(VAR,'N',1,39512)
LexToken(CLOSEBRACKET,')',1,39513)
LexToken(ASSIGNMENT,'=',1,39514)
@@ -9594,14 +9634,16 @@ LexToken(COMMA,',',1,39541)
LexToken(VAR,'zeros',1,39542)
LexToken(OPENBRACKET,'(',1,39547)
LexToken(NUMBER,'3',1,39548)
-LexToken(OPERATOR,'*',1,39549)
+LexToken(MULTIPLICATION,'*',1,39549)
LexToken(VAR,'N',1,39550)
-LexToken(NUMBER,'-1',1,39551)
+LexToken(ADDITION,'-',1,39551)
+LexToken(NUMBER,'1',1,39552)
LexToken(COMMA,',',1,39553)
LexToken(NUMBER,'3',1,39554)
-LexToken(OPERATOR,'*',1,39555)
+LexToken(MULTIPLICATION,'*',1,39555)
LexToken(VAR,'N',1,39556)
-LexToken(NUMBER,'-1',1,39557)
+LexToken(ADDITION,'-',1,39557)
+LexToken(NUMBER,'1',1,39558)
LexToken(CLOSEBRACKET,')',1,39559)
LexToken(CLOSESQBRACKET,']',1,39560)
LexToken(EOL,'\n',1,39561)
@@ -9611,7 +9653,7 @@ LexToken(OPENSQBRACKET,'[',1,39569)
LexToken(VAR,'zeros',1,39570)
LexToken(OPENBRACKET,'(',1,39575)
LexToken(NUMBER,'3',1,39576)
-LexToken(OPERATOR,'*',1,39577)
+LexToken(MULTIPLICATION,'*',1,39577)
LexToken(VAR,'N',1,39578)
LexToken(COMMA,',',1,39579)
LexToken(NUMBER,'1',1,39580)
@@ -9623,7 +9665,7 @@ LexToken(EOL,'\n',1,39585)
LexToken(VAR,'Zt',1,39590)
LexToken(ASSIGNMENT,'=',1,39592)
LexToken(VAR,'At',1,39593)
-LexToken(OPERATOR,'\\',1,39595)
+LexToken(MULTIPLICATION,'\\',1,39595)
LexToken(VAR,'Bt',1,39596)
LexToken(SEMICOLON,';',1,39598)
LexToken(EOL,'\n',1,39599)
@@ -9634,7 +9676,7 @@ LexToken(OPENBRACKET,'(',1,39608)
LexToken(NUMBER,'1',1,39609)
LexToken(COLON,':',1,39610)
LexToken(NUMBER,'3',1,39611)
-LexToken(OPERATOR,'*',1,39612)
+LexToken(MULTIPLICATION,'*',1,39612)
LexToken(VAR,'N',1,39613)
LexToken(COMMA,',',1,39614)
LexToken(NUMBER,'1',1,39615)
diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js
index 4e7a849e..ed23d172 100644
--- a/js/Sources/CURV_f.js
+++ b/js/Sources/CURV_f.js
@@ -120,11 +120,11 @@ LexToken(ASSIGNMENT,'=',1,1141)
LexToken(VAR,'rpar',1,1143)
LexToken(OPENBRACKET,'(',1,1147)
LexToken(VAR,'n',1,1148)
-LexToken(OPERATOR,'+',1,1149)
+LexToken(ADDITION,'+',1,1149)
LexToken(NUMBER,'1',1,1150)
LexToken(COLON,':',1,1151)
LexToken(NUMBER,'2',1,1152)
-LexToken(OPERATOR,'*',1,1153)
+LexToken(MULTIPLICATION,'*',1,1153)
LexToken(VAR,'n',1,1154)
LexToken(CLOSEBRACKET,')',1,1155)
LexToken(SEMICOLON,';',1,1156)
@@ -136,15 +136,15 @@ LexToken(OPENBRACKET,'(',1,1175)
LexToken(VAR,'rpar',1,1176)
LexToken(OPENBRACKET,'(',1,1180)
LexToken(NUMBER,'2',1,1181)
-LexToken(OPERATOR,'*',1,1182)
+LexToken(MULTIPLICATION,'*',1,1182)
LexToken(VAR,'n',1,1183)
-LexToken(OPERATOR,'+',1,1184)
+LexToken(ADDITION,'+',1,1184)
LexToken(NUMBER,'1',1,1185)
LexToken(COLON,':',1,1186)
LexToken(NUMBER,'2',1,1187)
-LexToken(OPERATOR,'*',1,1188)
+LexToken(MULTIPLICATION,'*',1,1188)
LexToken(VAR,'n',1,1189)
-LexToken(OPERATOR,'+',1,1190)
+LexToken(ADDITION,'+',1,1190)
LexToken(NUMBER,'4',1,1191)
LexToken(CLOSEBRACKET,')',1,1192)
LexToken(COMMA,',',1,1193)
@@ -251,13 +251,14 @@ LexToken(NUMBER,'2',1,1619)
LexToken(COLON,':',1,1620)
LexToken(VAR,'n',1,1621)
LexToken(CLOSEBRACKET,')',1,1622)
-LexToken(OPERATOR,'-',1,1623)
+LexToken(ADDITION,'-',1,1623)
LexToken(VAR,'xx',1,1624)
LexToken(OPENBRACKET,'(',1,1626)
LexToken(NUMBER,'1',1,1627)
LexToken(COLON,':',1,1628)
LexToken(VAR,'n',1,1629)
-LexToken(NUMBER,'-1',1,1630)
+LexToken(ADDITION,'-',1,1630)
+LexToken(NUMBER,'1',1,1631)
LexToken(CLOSEBRACKET,')',1,1632)
LexToken(COMPARISON,'<',1,1633)
LexToken(NUMBER,'0',1,1634)
@@ -386,7 +387,8 @@ LexToken(EOL,'\n',1,2187)
LexToken(VAR,'yy',1,2196)
LexToken(ASSIGNMENT,'=',1,2199)
LexToken(OPENSQBRACKET,'[',1,2201)
-LexToken(NUMBER,'-5',1,2202)
+LexToken(ADDITION,'-',1,2202)
+LexToken(NUMBER,'5',1,2203)
LexToken(SEMICOLON,';',1,2204)
LexToken(NUMBER,'5',1,2205)
LexToken(SEMICOLON,';',1,2206)
@@ -398,7 +400,8 @@ LexToken(ASSIGNMENT,'=',1,2223)
LexToken(OPENSQBRACKET,'[',1,2225)
LexToken(NUMBER,'0',1,2226)
LexToken(COMMA,',',1,2227)
-LexToken(NUMBER,'-5',1,2228)
+LexToken(ADDITION,'-',1,2228)
+LexToken(NUMBER,'5',1,2229)
LexToken(COMMA,',',1,2230)
LexToken(NUMBER,'2',1,2231)
LexToken(COMMA,',',1,2232)
diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js
index c881e400..f2f94229 100644
--- a/js/Sources/FROMWSB.js
+++ b/js/Sources/FROMWSB.js
@@ -167,7 +167,7 @@ LexToken(EOL,'\n',1,1371)
LexToken(VAR,'spath',1,1388)
LexToken(OPENBRACKET,'(',1,1393)
LexToken(LASTINDEX,'$',1,1394)
-LexToken(OPERATOR,'+',1,1395)
+LexToken(ADDITION,'+',1,1395)
LexToken(NUMBER,'1',1,1396)
LexToken(CLOSEBRACKET,')',1,1397)
LexToken(ASSIGNMENT,'=',1,1398)
@@ -176,7 +176,7 @@ LexToken(EOL,'\n',1,1406)
LexToken(VAR,'spath',1,1423)
LexToken(OPENBRACKET,'(',1,1428)
LexToken(LASTINDEX,'$',1,1429)
-LexToken(OPERATOR,'+',1,1430)
+LexToken(ADDITION,'+',1,1430)
LexToken(NUMBER,'1',1,1431)
LexToken(CLOSEBRACKET,')',1,1432)
LexToken(ASSIGNMENT,'=',1,1433)
@@ -185,7 +185,7 @@ LexToken(EOL,'\n',1,1440)
LexToken(VAR,'spath',1,1457)
LexToken(OPENBRACKET,'(',1,1462)
LexToken(LASTINDEX,'$',1,1463)
-LexToken(OPERATOR,'+',1,1464)
+LexToken(ADDITION,'+',1,1464)
LexToken(NUMBER,'1',1,1465)
LexToken(CLOSEBRACKET,')',1,1466)
LexToken(ASSIGNMENT,'=',1,1467)
@@ -194,7 +194,7 @@ LexToken(EOL,'\n',1,1474)
LexToken(VAR,'spath',1,1491)
LexToken(OPENBRACKET,'(',1,1496)
LexToken(LASTINDEX,'$',1,1497)
-LexToken(OPERATOR,'+',1,1498)
+LexToken(ADDITION,'+',1,1498)
LexToken(NUMBER,'1',1,1499)
LexToken(CLOSEBRACKET,')',1,1500)
LexToken(ASSIGNMENT,'=',1,1501)
@@ -215,11 +215,11 @@ LexToken(EOL,'\n',1,1568)
LexToken(VAR,'execstr',1,1581)
LexToken(OPENBRACKET,'(',1,1588)
LexToken(DQSTRING,'"xxn="',1,1594)
-LexToken(OPERATOR,'+',1,1595)
+LexToken(ADDITION,'+',1,1595)
LexToken(VAR,'xx',1,1596)
LexToken(DOT,'.',1,1598)
LexToken(VAR,'gui',1,1599)
-LexToken(OPERATOR,'+',1,1602)
+LexToken(ADDITION,'+',1,1602)
LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1616)
LexToken(CLOSEBRACKET,')',1,1617)
LexToken(EOL,'\n',1,1618)
@@ -713,7 +713,7 @@ LexToken(VAR,'size',1,4204)
LexToken(OPENBRACKET,'(',1,4208)
LexToken(VAR,'newpar',1,4209)
LexToken(CLOSEBRACKET,')',1,4215)
-LexToken(OPERATOR,'+',1,4216)
+LexToken(ADDITION,'+',1,4216)
LexToken(NUMBER,'1',1,4217)
LexToken(CLOSEBRACKET,')',1,4218)
LexToken(ASSIGNMENT,'=',1,4219)
@@ -759,11 +759,13 @@ LexToken(OPENBRACKET,'(',1,4461)
LexToken(VAR,'wpar',1,4473)
LexToken(ASSIGNMENT,'=',1,4477)
LexToken(OPENSQBRACKET,'[',1,4478)
-LexToken(NUMBER,'-159.096',1,4479)
+LexToken(ADDITION,'-',1,4479)
+LexToken(NUMBER,'159.096',1,4480)
LexToken(COMMA,',',1,4487)
LexToken(NUMBER,'811.104',1,4488)
LexToken(COMMA,',',1,4495)
-LexToken(NUMBER,'-121.216',1,4496)
+LexToken(ADDITION,'-',1,4496)
+LexToken(NUMBER,'121.216',1,4497)
LexToken(COMMA,',',1,4504)
LexToken(NUMBER,'617.984',1,4505)
LexToken(COMMA,',',1,4512)
@@ -799,7 +801,8 @@ LexToken(NUMBER,'0.000001',1,4603)
LexToken(COMMA,',',1,4611)
LexToken(NUMBER,'1.000',1,4612)
LexToken(VAR,'D',1,4617)
-LexToken(NUMBER,'-10',1,4618)
+LexToken(ADDITION,'-',1,4618)
+LexToken(NUMBER,'10',1,4619)
LexToken(COMMA,',',1,4621)
LexToken(NUMBER,'100001',1,4622)
LexToken(COMMA,',',1,4628)
@@ -1018,15 +1021,18 @@ LexToken(NUMBER,'1',1,5413)
LexToken(COMMA,',',1,5414)
LexToken(VAR,'out',1,5426)
LexToken(ASSIGNMENT,'=',1,5429)
-LexToken(NUMBER,'-1',1,5430)
+LexToken(ADDITION,'-',1,5430)
+LexToken(NUMBER,'1',1,5431)
LexToken(COMMA,',',1,5432)
LexToken(VAR,'out2',1,5444)
LexToken(ASSIGNMENT,'=',1,5448)
-LexToken(NUMBER,'-2',1,5449)
+LexToken(ADDITION,'-',1,5449)
+LexToken(NUMBER,'2',1,5450)
LexToken(COMMA,',',1,5451)
LexToken(VAR,'outtyp',1,5463)
LexToken(ASSIGNMENT,'=',1,5469)
-LexToken(NUMBER,'-1',1,5470)
+LexToken(ADDITION,'-',1,5470)
+LexToken(NUMBER,'1',1,5471)
LexToken(COMMA,',',1,5472)
LexToken(VAR,'evtin',1,5484)
LexToken(ASSIGNMENT,'=',1,5489)
@@ -1062,7 +1068,8 @@ LexToken(ASSIGNMENT,'=',1,5613)
LexToken(OPENSQBRACKET,'[',1,5614)
LexToken(NUMBER,'1',1,5615)
LexToken(SEMICOLON,';',1,5616)
-LexToken(NUMBER,'-31',1,5617)
+LexToken(ADDITION,'-',1,5617)
+LexToken(NUMBER,'31',1,5618)
LexToken(SEMICOLON,';',1,5620)
LexToken(NUMBER,'1',1,5621)
LexToken(SEMICOLON,';',1,5622)
@@ -1177,7 +1184,8 @@ LexToken(ASSIGNMENT,'=',1,6083)
LexToken(OPENSQBRACKET,'[',1,6084)
LexToken(NUMBER,'5',1,6085)
LexToken(COMMA,',',1,6086)
-LexToken(NUMBER,'-1',1,6087)
+LexToken(ADDITION,'-',1,6087)
+LexToken(NUMBER,'1',1,6088)
LexToken(CLOSESQBRACKET,']',1,6089)
LexToken(COMMA,',',1,6090)
LexToken(VAR,'from',1,6102)
@@ -1294,15 +1302,18 @@ LexToken(DQSTRING,'"output"',1,6568)
LexToken(COMMA,',',1,6569)
LexToken(VAR,'in',1,6581)
LexToken(ASSIGNMENT,'=',1,6583)
-LexToken(NUMBER,'-1',1,6584)
+LexToken(ADDITION,'-',1,6584)
+LexToken(NUMBER,'1',1,6585)
LexToken(COMMA,',',1,6586)
LexToken(VAR,'in2',1,6598)
LexToken(ASSIGNMENT,'=',1,6601)
-LexToken(NUMBER,'-2',1,6602)
+LexToken(ADDITION,'-',1,6602)
+LexToken(NUMBER,'2',1,6603)
LexToken(COMMA,',',1,6604)
LexToken(VAR,'intyp',1,6616)
LexToken(ASSIGNMENT,'=',1,6621)
-LexToken(NUMBER,'-1',1,6622)
+LexToken(ADDITION,'-',1,6622)
+LexToken(NUMBER,'1',1,6623)
LexToken(COMMA,',',1,6624)
LexToken(VAR,'out',1,6636)
LexToken(ASSIGNMENT,'=',1,6639)
@@ -1492,11 +1503,13 @@ LexToken(NUMBER,'1',1,7354)
LexToken(COMMA,',',1,7355)
LexToken(VAR,'out',1,7367)
LexToken(ASSIGNMENT,'=',1,7370)
-LexToken(NUMBER,'-1',1,7371)
+LexToken(ADDITION,'-',1,7371)
+LexToken(NUMBER,'1',1,7372)
LexToken(COMMA,',',1,7373)
LexToken(VAR,'out2',1,7385)
LexToken(ASSIGNMENT,'=',1,7389)
-LexToken(NUMBER,'-2',1,7390)
+LexToken(ADDITION,'-',1,7390)
+LexToken(NUMBER,'2',1,7391)
LexToken(COMMA,',',1,7392)
LexToken(VAR,'outtyp',1,7404)
LexToken(ASSIGNMENT,'=',1,7410)
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index 42eef932..eb294530 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -330,12 +330,15 @@ LexToken(COMMA,',',1,2424)
LexToken(VAR,'list',1,2425)
LexToken(OPENBRACKET,'(',1,2429)
LexToken(OPENSQBRACKET,'[',1,2430)
-LexToken(NUMBER,'-1',1,2431)
+LexToken(ADDITION,'-',1,2431)
+LexToken(NUMBER,'1',1,2432)
LexToken(COMMA,',',1,2433)
-LexToken(NUMBER,'-2',1,2434)
+LexToken(ADDITION,'-',1,2434)
+LexToken(NUMBER,'2',1,2435)
LexToken(CLOSESQBRACKET,']',1,2436)
LexToken(COMMA,',',1,2437)
-LexToken(NUMBER,'-1',1,2438)
+LexToken(ADDITION,'-',1,2438)
+LexToken(NUMBER,'1',1,2439)
LexToken(CLOSEBRACKET,')',1,2440)
LexToken(COMMA,',',1,2441)
LexToken(NUMBER,'1',1,2442)
@@ -425,19 +428,22 @@ LexToken(VAR,'model',1,2860)
LexToken(DOT,'.',1,2865)
LexToken(VAR,'out',1,2866)
LexToken(ASSIGNMENT,'=',1,2869)
-LexToken(NUMBER,'-1',1,2870)
+LexToken(ADDITION,'-',1,2870)
+LexToken(NUMBER,'1',1,2871)
LexToken(EOL,'\n',1,2872)
LexToken(VAR,'model',1,2881)
LexToken(DOT,'.',1,2886)
LexToken(VAR,'out2',1,2887)
LexToken(ASSIGNMENT,'=',1,2891)
-LexToken(NUMBER,'-2',1,2892)
+LexToken(ADDITION,'-',1,2892)
+LexToken(NUMBER,'2',1,2893)
LexToken(EOL,'\n',1,2894)
LexToken(VAR,'model',1,2903)
LexToken(DOT,'.',1,2908)
LexToken(VAR,'outtyp',1,2909)
LexToken(ASSIGNMENT,'=',1,2915)
-LexToken(NUMBER,'-1',1,2916)
+LexToken(ADDITION,'-',1,2916)
+LexToken(NUMBER,'1',1,2917)
LexToken(EOL,'\n',1,2918)
LexToken(VAR,'model',1,2927)
LexToken(DOT,'.',1,2932)
diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js
index 46de75c7..74a60f27 100644
--- a/js/Sources/GEN_SQR.js
+++ b/js/Sources/GEN_SQR.js
@@ -130,26 +130,32 @@ LexToken(OPENBRACKET,'(',1,1401)
LexToken(DQSTRING,'"mat"',1,1406)
LexToken(COMMA,',',1,1407)
LexToken(OPENSQBRACKET,'[',1,1408)
-LexToken(NUMBER,'-1',1,1409)
+LexToken(ADDITION,'-',1,1409)
+LexToken(NUMBER,'1',1,1410)
LexToken(COMMA,',',1,1411)
-LexToken(NUMBER,'-1',1,1412)
+LexToken(ADDITION,'-',1,1412)
+LexToken(NUMBER,'1',1,1413)
LexToken(CLOSESQBRACKET,']',1,1414)
LexToken(COMMA,',',1,1415)
LexToken(DQSTRING,'"mat"',1,1420)
LexToken(COMMA,',',1,1421)
LexToken(OPENSQBRACKET,'[',1,1422)
-LexToken(NUMBER,'-1',1,1423)
+LexToken(ADDITION,'-',1,1423)
+LexToken(NUMBER,'1',1,1424)
LexToken(COMMA,',',1,1425)
-LexToken(NUMBER,'-1',1,1426)
+LexToken(ADDITION,'-',1,1426)
+LexToken(NUMBER,'1',1,1427)
LexToken(CLOSESQBRACKET,']',1,1428)
LexToken(COMMA,',',1,1429)
LexToken(DQSTRING,'"pol"',1,1434)
LexToken(COMMA,',',1,1435)
-LexToken(NUMBER,'-1',1,1436)
+LexToken(ADDITION,'-',1,1436)
+LexToken(NUMBER,'1',1,1437)
LexToken(COMMA,',',1,1438)
LexToken(DQSTRING,'"pol"',1,1443)
LexToken(COMMA,',',1,1444)
-LexToken(NUMBER,'-1',1,1445)
+LexToken(ADDITION,'-',1,1445)
+LexToken(NUMBER,'1',1,1446)
LexToken(CLOSEBRACKET,')',1,1447)
LexToken(EOL,'\n',1,1448)
LexToken(SCICOS_CONTEXT,'scicos_context',1,1457)
@@ -340,7 +346,8 @@ LexToken(OPENBRACKET,'(',1,2419)
LexToken(VAR,'wpar',1,2431)
LexToken(ASSIGNMENT,'=',1,2435)
LexToken(OPENSQBRACKET,'[',1,2436)
-LexToken(NUMBER,'-176.97473',1,2437)
+LexToken(ADDITION,'-',1,2437)
+LexToken(NUMBER,'176.97473',1,2438)
LexToken(COMMA,',',1,2447)
LexToken(NUMBER,'421.18646',1,2448)
LexToken(COMMA,',',1,2457)
@@ -380,7 +387,8 @@ LexToken(NUMBER,'0.000001',1,2565)
LexToken(COMMA,',',1,2573)
LexToken(NUMBER,'1.000',1,2574)
LexToken(VAR,'D',1,2579)
-LexToken(NUMBER,'-10',1,2580)
+LexToken(ADDITION,'-',1,2580)
+LexToken(NUMBER,'10',1,2581)
LexToken(COMMA,',',1,2583)
LexToken(NUMBER,'100001',1,2584)
LexToken(COMMA,',',1,2590)
@@ -868,7 +876,8 @@ LexToken(VAR,'opar',1,4839)
LexToken(ASSIGNMENT,'=',1,4843)
LexToken(VAR,'list',1,4844)
LexToken(OPENBRACKET,'(',1,4848)
-LexToken(NUMBER,'-1',1,4849)
+LexToken(ADDITION,'-',1,4849)
+LexToken(NUMBER,'1',1,4850)
LexToken(CLOSEBRACKET,')',1,4851)
LexToken(COMMA,',',1,4852)
LexToken(VAR,'blocktype',1,4864)
@@ -1236,38 +1245,47 @@ LexToken(COMMA,',',1,6426)
LexToken(VAR,'in',1,6438)
LexToken(ASSIGNMENT,'=',1,6440)
LexToken(OPENSQBRACKET,'[',1,6441)
-LexToken(NUMBER,'-1',1,6442)
+LexToken(ADDITION,'-',1,6442)
+LexToken(NUMBER,'1',1,6443)
LexToken(SEMICOLON,';',1,6444)
-LexToken(NUMBER,'-1',1,6445)
+LexToken(ADDITION,'-',1,6445)
+LexToken(NUMBER,'1',1,6446)
LexToken(CLOSESQBRACKET,']',1,6447)
LexToken(COMMA,',',1,6448)
LexToken(VAR,'in2',1,6460)
LexToken(ASSIGNMENT,'=',1,6463)
LexToken(OPENSQBRACKET,'[',1,6464)
-LexToken(NUMBER,'-2',1,6465)
+LexToken(ADDITION,'-',1,6465)
+LexToken(NUMBER,'2',1,6466)
LexToken(SEMICOLON,';',1,6467)
-LexToken(NUMBER,'-2',1,6468)
+LexToken(ADDITION,'-',1,6468)
+LexToken(NUMBER,'2',1,6469)
LexToken(CLOSESQBRACKET,']',1,6470)
LexToken(COMMA,',',1,6471)
LexToken(VAR,'intyp',1,6483)
LexToken(ASSIGNMENT,'=',1,6488)
LexToken(OPENSQBRACKET,'[',1,6489)
-LexToken(NUMBER,'-1',1,6490)
+LexToken(ADDITION,'-',1,6490)
+LexToken(NUMBER,'1',1,6491)
LexToken(SEMICOLON,';',1,6492)
-LexToken(NUMBER,'-1',1,6493)
+LexToken(ADDITION,'-',1,6493)
+LexToken(NUMBER,'1',1,6494)
LexToken(CLOSESQBRACKET,']',1,6495)
LexToken(COMMA,',',1,6496)
LexToken(VAR,'out',1,6508)
LexToken(ASSIGNMENT,'=',1,6511)
-LexToken(NUMBER,'-1',1,6512)
+LexToken(ADDITION,'-',1,6512)
+LexToken(NUMBER,'1',1,6513)
LexToken(COMMA,',',1,6514)
LexToken(VAR,'out2',1,6526)
LexToken(ASSIGNMENT,'=',1,6530)
-LexToken(NUMBER,'-2',1,6531)
+LexToken(ADDITION,'-',1,6531)
+LexToken(NUMBER,'2',1,6532)
LexToken(COMMA,',',1,6533)
LexToken(VAR,'outtyp',1,6545)
LexToken(ASSIGNMENT,'=',1,6551)
-LexToken(NUMBER,'-1',1,6552)
+LexToken(ADDITION,'-',1,6552)
+LexToken(NUMBER,'1',1,6553)
LexToken(COMMA,',',1,6554)
LexToken(VAR,'evtin',1,6566)
LexToken(ASSIGNMENT,'=',1,6571)
@@ -1598,7 +1616,8 @@ LexToken(VAR,'list',1,7837)
LexToken(OPENBRACKET,'(',1,7841)
LexToken(DQSTRING,'"eselect"',1,7850)
LexToken(COMMA,',',1,7851)
-LexToken(NUMBER,'-2',1,7852)
+LexToken(ADDITION,'-',1,7852)
+LexToken(NUMBER,'2',1,7853)
LexToken(CLOSEBRACKET,')',1,7854)
LexToken(COMMA,',',1,7855)
LexToken(VAR,'in',1,7867)
@@ -1611,7 +1630,8 @@ LexToken(NUMBER,'1',1,7887)
LexToken(COMMA,',',1,7888)
LexToken(VAR,'intyp',1,7900)
LexToken(ASSIGNMENT,'=',1,7905)
-LexToken(NUMBER,'-1',1,7906)
+LexToken(ADDITION,'-',1,7906)
+LexToken(NUMBER,'1',1,7907)
LexToken(COMMA,',',1,7908)
LexToken(VAR,'out',1,7920)
LexToken(ASSIGNMENT,'=',1,7923)
@@ -1679,9 +1699,11 @@ LexToken(COMMA,',',1,8162)
LexToken(VAR,'firing',1,8174)
LexToken(ASSIGNMENT,'=',1,8180)
LexToken(OPENSQBRACKET,'[',1,8181)
-LexToken(NUMBER,'-1',1,8182)
+LexToken(ADDITION,'-',1,8182)
+LexToken(NUMBER,'1',1,8183)
LexToken(SEMICOLON,';',1,8184)
-LexToken(NUMBER,'-1',1,8185)
+LexToken(ADDITION,'-',1,8185)
+LexToken(NUMBER,'1',1,8186)
LexToken(CLOSESQBRACKET,']',1,8187)
LexToken(COMMA,',',1,8188)
LexToken(VAR,'dep_ut',1,8200)
@@ -1826,7 +1848,8 @@ LexToken(ASSIGNMENT,'=',1,8715)
LexToken(OPENSQBRACKET,'[',1,8716)
LexToken(NUMBER,'5',1,8717)
LexToken(COMMA,',',1,8718)
-LexToken(NUMBER,'-1',1,8719)
+LexToken(ADDITION,'-',1,8719)
+LexToken(NUMBER,'1',1,8720)
LexToken(CLOSESQBRACKET,']',1,8721)
LexToken(COMMA,',',1,8722)
LexToken(VAR,'from',1,8734)
@@ -1892,7 +1915,8 @@ LexToken(ASSIGNMENT,'=',1,8939)
LexToken(OPENSQBRACKET,'[',1,8940)
LexToken(NUMBER,'5',1,8941)
LexToken(COMMA,',',1,8942)
-LexToken(NUMBER,'-1',1,8943)
+LexToken(ADDITION,'-',1,8943)
+LexToken(NUMBER,'1',1,8944)
LexToken(CLOSESQBRACKET,']',1,8945)
LexToken(COMMA,',',1,8946)
LexToken(VAR,'from',1,8958)
@@ -2033,15 +2057,18 @@ LexToken(DQSTRING,'"output"',1,9513)
LexToken(COMMA,',',1,9514)
LexToken(VAR,'in',1,9526)
LexToken(ASSIGNMENT,'=',1,9528)
-LexToken(NUMBER,'-1',1,9529)
+LexToken(ADDITION,'-',1,9529)
+LexToken(NUMBER,'1',1,9530)
LexToken(COMMA,',',1,9531)
LexToken(VAR,'in2',1,9543)
LexToken(ASSIGNMENT,'=',1,9546)
-LexToken(NUMBER,'-2',1,9547)
+LexToken(ADDITION,'-',1,9547)
+LexToken(NUMBER,'2',1,9548)
LexToken(COMMA,',',1,9549)
LexToken(VAR,'intyp',1,9561)
LexToken(ASSIGNMENT,'=',1,9566)
-LexToken(NUMBER,'-1',1,9567)
+LexToken(ADDITION,'-',1,9567)
+LexToken(NUMBER,'1',1,9568)
LexToken(COMMA,',',1,9569)
LexToken(VAR,'out',1,9581)
LexToken(ASSIGNMENT,'=',1,9584)
@@ -2360,7 +2387,7 @@ LexToken(VAR,'rpar',1,10884)
LexToken(ASSIGNMENT,'=',1,10888)
LexToken(OPENSQBRACKET,'[',1,10889)
LexToken(NUMBER,'1',1,10890)
-LexToken(OPERATOR,'/',1,10891)
+LexToken(MULTIPLICATION,'/',1,10891)
LexToken(NUMBER,'2',1,10892)
LexToken(SEMICOLON,';',1,10893)
LexToken(NUMBER,'0',1,10894)
@@ -2383,7 +2410,8 @@ LexToken(DQSTRING,'"d"',1,10962)
LexToken(COMMA,',',1,10963)
LexToken(VAR,'firing',1,10975)
LexToken(ASSIGNMENT,'=',1,10981)
-LexToken(NUMBER,'-1',1,10982)
+LexToken(ADDITION,'-',1,10982)
+LexToken(NUMBER,'1',1,10983)
LexToken(COMMA,',',1,10984)
LexToken(VAR,'dep_ut',1,10996)
LexToken(ASSIGNMENT,'=',1,11002)
@@ -2461,7 +2489,8 @@ LexToken(ASSIGNMENT,'=',1,11293)
LexToken(OPENSQBRACKET,'[',1,11294)
LexToken(NUMBER,'5',1,11295)
LexToken(COMMA,',',1,11296)
-LexToken(NUMBER,'-1',1,11297)
+LexToken(ADDITION,'-',1,11297)
+LexToken(NUMBER,'1',1,11298)
LexToken(CLOSESQBRACKET,']',1,11299)
LexToken(COMMA,',',1,11300)
LexToken(VAR,'from',1,11312)
@@ -2521,19 +2550,22 @@ LexToken(VAR,'model',1,11476)
LexToken(DOT,'.',1,11481)
LexToken(VAR,'out',1,11482)
LexToken(ASSIGNMENT,'=',1,11485)
-LexToken(NUMBER,'-1',1,11486)
+LexToken(ADDITION,'-',1,11486)
+LexToken(NUMBER,'1',1,11487)
LexToken(EOL,'\n',1,11488)
LexToken(VAR,'model',1,11497)
LexToken(DOT,'.',1,11502)
LexToken(VAR,'out2',1,11503)
LexToken(ASSIGNMENT,'=',1,11507)
-LexToken(NUMBER,'-2',1,11508)
+LexToken(ADDITION,'-',1,11508)
+LexToken(NUMBER,'2',1,11509)
LexToken(EOL,'\n',1,11510)
LexToken(VAR,'model',1,11519)
LexToken(DOT,'.',1,11524)
LexToken(VAR,'outtyp',1,11525)
LexToken(ASSIGNMENT,'=',1,11531)
-LexToken(NUMBER,'-1',1,11532)
+LexToken(ADDITION,'-',1,11532)
+LexToken(NUMBER,'1',1,11533)
LexToken(EOL,'\n',1,11534)
LexToken(VAR,'model',1,11543)
LexToken(DOT,'.',1,11548)
@@ -2642,7 +2674,8 @@ LexToken(CLOSEBRACKET,')',1,11911)
LexToken(EOL,'\n',1,11912)
LexToken(VAR,'Amin',1,11921)
LexToken(ASSIGNMENT,'=',1,11925)
-LexToken(NUMBER,'-1',1,11926)
+LexToken(ADDITION,'-',1,11926)
+LexToken(NUMBER,'1',1,11927)
LexToken(EOL,'\n',1,11928)
LexToken(VAR,'Amax',1,11937)
LexToken(ASSIGNMENT,'=',1,11941)
diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js
index f705621f..9c053287 100644
--- a/js/Sources/Ground_g.js
+++ b/js/Sources/Ground_g.js
@@ -125,7 +125,8 @@ LexToken(VAR,'model',1,1176)
LexToken(DOT,'.',1,1181)
LexToken(VAR,'outtyp',1,1182)
LexToken(ASSIGNMENT,'=',1,1188)
-LexToken(NUMBER,'-1',1,1189)
+LexToken(ADDITION,'-',1,1189)
+LexToken(NUMBER,'1',1,1190)
LexToken(EOL,'\n',1,1191)
LexToken(VAR,'model',1,1200)
LexToken(DOT,'.',1,1205)
diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js
index fa2c34f7..ecc49934 100644
--- a/js/Sources/INIMPL_f.js
+++ b/js/Sources/INIMPL_f.js
@@ -272,7 +272,8 @@ LexToken(DOT,'.',1,2163)
LexToken(VAR,'out',1,2164)
LexToken(ASSIGNMENT,'=',1,2167)
LexToken(OPENSQBRACKET,'[',1,2168)
-LexToken(NUMBER,'-1',1,2169)
+LexToken(ADDITION,'-',1,2169)
+LexToken(NUMBER,'1',1,2170)
LexToken(CLOSESQBRACKET,']',1,2171)
LexToken(EOL,'\n',1,2172)
LexToken(VAR,'model',1,2181)
diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js
index f0cecf03..dba8888b 100644
--- a/js/Sources/IN_f.js
+++ b/js/Sources/IN_f.js
@@ -185,7 +185,8 @@ LexToken(NUMBER,'1',1,1577)
LexToken(COMMA,',',1,1578)
LexToken(DQSTRING,'"vec"',1,1583)
LexToken(COMMA,',',1,1584)
-LexToken(NUMBER,'-1',1,1585)
+LexToken(ADDITION,'-',1,1585)
+LexToken(NUMBER,'1',1,1586)
LexToken(COMMA,',',1,1587)
LexToken(DQSTRING,'"vec"',1,1592)
LexToken(COMMA,',',1,1593)
@@ -264,7 +265,8 @@ LexToken(LOGICAL,'&',1,1941)
LexToken(OPENBRACKET,'(',1,1942)
LexToken(VAR,'ot',1,1943)
LexToken(COMPARISON,'<>',1,1945)
-LexToken(NUMBER,'-1',1,1947)
+LexToken(ADDITION,'-',1,1947)
+LexToken(NUMBER,'1',1,1948)
LexToken(CLOSEBRACKET,')',1,1949)
LexToken(CLOSEBRACKET,')',1,1950)
LexToken(THEN,'then',1,1952)
@@ -386,19 +388,22 @@ LexToken(VAR,'model',1,2623)
LexToken(DOT,'.',1,2628)
LexToken(VAR,'out',1,2629)
LexToken(ASSIGNMENT,'=',1,2632)
-LexToken(NUMBER,'-1',1,2633)
+LexToken(ADDITION,'-',1,2633)
+LexToken(NUMBER,'1',1,2634)
LexToken(EOL,'\n',1,2635)
LexToken(VAR,'model',1,2644)
LexToken(DOT,'.',1,2649)
LexToken(VAR,'out2',1,2650)
LexToken(ASSIGNMENT,'=',1,2654)
-LexToken(NUMBER,'-2',1,2655)
+LexToken(ADDITION,'-',1,2655)
+LexToken(NUMBER,'2',1,2656)
LexToken(EOL,'\n',1,2657)
LexToken(VAR,'model',1,2666)
LexToken(DOT,'.',1,2671)
LexToken(VAR,'outtyp',1,2672)
LexToken(ASSIGNMENT,'=',1,2678)
-LexToken(NUMBER,'-1',1,2679)
+LexToken(ADDITION,'-',1,2679)
+LexToken(NUMBER,'1',1,2680)
LexToken(EOL,'\n',1,2681)
LexToken(VAR,'model',1,2690)
LexToken(DOT,'.',1,2695)
diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js
index 79fbd94d..195e7cca 100644
--- a/js/Sources/PULSE_SC.js
+++ b/js/Sources/PULSE_SC.js
@@ -128,21 +128,26 @@ LexToken(VAR,'list',1,1351)
LexToken(OPENBRACKET,'(',1,1355)
LexToken(DQSTRING,'"pol"',1,1360)
LexToken(COMMA,',',1,1361)
-LexToken(NUMBER,'-1',1,1362)
+LexToken(ADDITION,'-',1,1362)
+LexToken(NUMBER,'1',1,1363)
LexToken(COMMA,',',1,1364)
LexToken(DQSTRING,'"pol"',1,1369)
LexToken(COMMA,',',1,1370)
-LexToken(NUMBER,'-1',1,1371)
+LexToken(ADDITION,'-',1,1371)
+LexToken(NUMBER,'1',1,1372)
LexToken(COMMA,',',1,1373)
LexToken(DQSTRING,'"pol"',1,1378)
LexToken(COMMA,',',1,1379)
-LexToken(NUMBER,'-1',1,1380)
+LexToken(ADDITION,'-',1,1380)
+LexToken(NUMBER,'1',1,1381)
LexToken(COMMA,',',1,1382)
LexToken(DQSTRING,'"mat"',1,1387)
LexToken(COMMA,',',1,1388)
LexToken(OPENSQBRACKET,'[',1,1389)
-LexToken(NUMBER,'-1',1,1390)
-LexToken(NUMBER,'-1',1,1393)
+LexToken(ADDITION,'-',1,1390)
+LexToken(NUMBER,'1',1,1391)
+LexToken(ADDITION,'-',1,1393)
+LexToken(NUMBER,'1',1,1394)
LexToken(CLOSESQBRACKET,']',1,1395)
LexToken(CLOSEBRACKET,')',1,1396)
LexToken(EOL,'\n',1,1397)
@@ -348,7 +353,8 @@ LexToken(OPENBRACKET,'(',1,2431)
LexToken(VAR,'wpar',1,2443)
LexToken(ASSIGNMENT,'=',1,2447)
LexToken(OPENSQBRACKET,'[',1,2448)
-LexToken(NUMBER,'-162.7581',1,2449)
+LexToken(ADDITION,'-',1,2449)
+LexToken(NUMBER,'162.7581',1,2450)
LexToken(COMMA,',',1,2458)
LexToken(NUMBER,'435.54369',1,2459)
LexToken(COMMA,',',1,2468)
@@ -392,7 +398,8 @@ LexToken(NUMBER,'0.000001',1,2608)
LexToken(SEMICOLON,';',1,2616)
LexToken(NUMBER,'1.000',1,2617)
LexToken(VAR,'D',1,2622)
-LexToken(NUMBER,'-10',1,2623)
+LexToken(ADDITION,'-',1,2623)
+LexToken(NUMBER,'10',1,2624)
LexToken(SEMICOLON,';',1,2626)
LexToken(NUMBER,'100001',1,2627)
LexToken(SEMICOLON,';',1,2633)
@@ -830,7 +837,8 @@ LexToken(NUMBER,'1',1,4541)
LexToken(COMMA,',',1,4542)
LexToken(VAR,'outtyp',1,4554)
LexToken(ASSIGNMENT,'=',1,4560)
-LexToken(NUMBER,'-1',1,4561)
+LexToken(ADDITION,'-',1,4561)
+LexToken(NUMBER,'1',1,4562)
LexToken(COMMA,',',1,4563)
LexToken(VAR,'evtin',1,4575)
LexToken(ASSIGNMENT,'=',1,4580)
@@ -1032,38 +1040,47 @@ LexToken(COMMA,',',1,5392)
LexToken(VAR,'in',1,5404)
LexToken(ASSIGNMENT,'=',1,5406)
LexToken(OPENSQBRACKET,'[',1,5407)
-LexToken(NUMBER,'-1',1,5408)
+LexToken(ADDITION,'-',1,5408)
+LexToken(NUMBER,'1',1,5409)
LexToken(SEMICOLON,';',1,5410)
-LexToken(NUMBER,'-1',1,5411)
+LexToken(ADDITION,'-',1,5411)
+LexToken(NUMBER,'1',1,5412)
LexToken(CLOSESQBRACKET,']',1,5413)
LexToken(COMMA,',',1,5414)
LexToken(VAR,'in2',1,5426)
LexToken(ASSIGNMENT,'=',1,5429)
LexToken(OPENSQBRACKET,'[',1,5430)
-LexToken(NUMBER,'-2',1,5431)
+LexToken(ADDITION,'-',1,5431)
+LexToken(NUMBER,'2',1,5432)
LexToken(SEMICOLON,';',1,5433)
-LexToken(NUMBER,'-2',1,5434)
+LexToken(ADDITION,'-',1,5434)
+LexToken(NUMBER,'2',1,5435)
LexToken(CLOSESQBRACKET,']',1,5436)
LexToken(COMMA,',',1,5437)
LexToken(VAR,'intyp',1,5449)
LexToken(ASSIGNMENT,'=',1,5454)
LexToken(OPENSQBRACKET,'[',1,5455)
-LexToken(NUMBER,'-1',1,5456)
+LexToken(ADDITION,'-',1,5456)
+LexToken(NUMBER,'1',1,5457)
LexToken(SEMICOLON,';',1,5458)
-LexToken(NUMBER,'-1',1,5459)
+LexToken(ADDITION,'-',1,5459)
+LexToken(NUMBER,'1',1,5460)
LexToken(CLOSESQBRACKET,']',1,5461)
LexToken(COMMA,',',1,5462)
LexToken(VAR,'out',1,5474)
LexToken(ASSIGNMENT,'=',1,5477)
-LexToken(NUMBER,'-1',1,5478)
+LexToken(ADDITION,'-',1,5478)
+LexToken(NUMBER,'1',1,5479)
LexToken(COMMA,',',1,5480)
LexToken(VAR,'out2',1,5492)
LexToken(ASSIGNMENT,'=',1,5496)
-LexToken(NUMBER,'-2',1,5497)
+LexToken(ADDITION,'-',1,5497)
+LexToken(NUMBER,'2',1,5498)
LexToken(COMMA,',',1,5499)
LexToken(VAR,'outtyp',1,5511)
LexToken(ASSIGNMENT,'=',1,5517)
-LexToken(NUMBER,'-1',1,5518)
+LexToken(ADDITION,'-',1,5518)
+LexToken(NUMBER,'1',1,5519)
LexToken(COMMA,',',1,5520)
LexToken(VAR,'evtin',1,5532)
LexToken(ASSIGNMENT,'=',1,5537)
@@ -1466,7 +1483,8 @@ LexToken(DQSTRING,'"d"',1,7109)
LexToken(COMMA,',',1,7110)
LexToken(VAR,'firing',1,7122)
LexToken(ASSIGNMENT,'=',1,7128)
-LexToken(NUMBER,'-1',1,7129)
+LexToken(ADDITION,'-',1,7129)
+LexToken(NUMBER,'1',1,7130)
LexToken(COMMA,',',1,7131)
LexToken(VAR,'dep_ut',1,7143)
LexToken(ASSIGNMENT,'=',1,7149)
@@ -1676,7 +1694,8 @@ LexToken(DQSTRING,'"d"',1,8024)
LexToken(COMMA,',',1,8025)
LexToken(VAR,'firing',1,8037)
LexToken(ASSIGNMENT,'=',1,8043)
-LexToken(NUMBER,'-1',1,8044)
+LexToken(ADDITION,'-',1,8044)
+LexToken(NUMBER,'1',1,8045)
LexToken(COMMA,',',1,8046)
LexToken(VAR,'dep_ut',1,8058)
LexToken(ASSIGNMENT,'=',1,8064)
@@ -1762,7 +1781,8 @@ LexToken(ASSIGNMENT,'=',1,8394)
LexToken(OPENSQBRACKET,'[',1,8395)
LexToken(NUMBER,'5',1,8396)
LexToken(COMMA,',',1,8397)
-LexToken(NUMBER,'-1',1,8398)
+LexToken(ADDITION,'-',1,8398)
+LexToken(NUMBER,'1',1,8399)
LexToken(CLOSESQBRACKET,']',1,8400)
LexToken(COMMA,',',1,8401)
LexToken(VAR,'from',1,8413)
@@ -1836,7 +1856,8 @@ LexToken(ASSIGNMENT,'=',1,8658)
LexToken(OPENSQBRACKET,'[',1,8659)
LexToken(NUMBER,'5',1,8660)
LexToken(COMMA,',',1,8661)
-LexToken(NUMBER,'-1',1,8662)
+LexToken(ADDITION,'-',1,8662)
+LexToken(NUMBER,'1',1,8663)
LexToken(CLOSESQBRACKET,']',1,8664)
LexToken(COMMA,',',1,8665)
LexToken(VAR,'from',1,8677)
@@ -1953,15 +1974,18 @@ LexToken(DQSTRING,'"output"',1,9148)
LexToken(COMMA,',',1,9149)
LexToken(VAR,'in',1,9161)
LexToken(ASSIGNMENT,'=',1,9163)
-LexToken(NUMBER,'-1',1,9164)
+LexToken(ADDITION,'-',1,9164)
+LexToken(NUMBER,'1',1,9165)
LexToken(COMMA,',',1,9166)
LexToken(VAR,'in2',1,9178)
LexToken(ASSIGNMENT,'=',1,9181)
-LexToken(NUMBER,'-2',1,9182)
+LexToken(ADDITION,'-',1,9182)
+LexToken(NUMBER,'2',1,9183)
LexToken(COMMA,',',1,9184)
LexToken(VAR,'intyp',1,9196)
LexToken(ASSIGNMENT,'=',1,9201)
-LexToken(NUMBER,'-1',1,9202)
+LexToken(ADDITION,'-',1,9202)
+LexToken(NUMBER,'1',1,9203)
LexToken(COMMA,',',1,9204)
LexToken(VAR,'out',1,9216)
LexToken(ASSIGNMENT,'=',1,9219)
@@ -2163,19 +2187,22 @@ LexToken(VAR,'model',1,9966)
LexToken(DOT,'.',1,9971)
LexToken(VAR,'out',1,9972)
LexToken(ASSIGNMENT,'=',1,9975)
-LexToken(NUMBER,'-1',1,9976)
+LexToken(ADDITION,'-',1,9976)
+LexToken(NUMBER,'1',1,9977)
LexToken(EOL,'\n',1,9978)
LexToken(VAR,'model',1,9987)
LexToken(DOT,'.',1,9992)
LexToken(VAR,'out2',1,9993)
LexToken(ASSIGNMENT,'=',1,9997)
-LexToken(NUMBER,'-2',1,9998)
+LexToken(ADDITION,'-',1,9998)
+LexToken(NUMBER,'2',1,9999)
LexToken(EOL,'\n',1,10000)
LexToken(VAR,'model',1,10009)
LexToken(DOT,'.',1,10014)
LexToken(VAR,'outtyp',1,10015)
LexToken(ASSIGNMENT,'=',1,10021)
-LexToken(NUMBER,'-1',1,10022)
+LexToken(ADDITION,'-',1,10022)
+LexToken(NUMBER,'1',1,10023)
LexToken(EOL,'\n',1,10024)
LexToken(VAR,'model',1,10033)
LexToken(DOT,'.',1,10038)
diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js
index 1f30adff..754dc86e 100644
--- a/js/Sources/RAND_f.js
+++ b/js/Sources/RAND_f.js
@@ -192,7 +192,8 @@ LexToken(NUMBER,'1',1,1733)
LexToken(COMMA,',',1,1734)
LexToken(DQSTRING,'"vec"',1,1739)
LexToken(COMMA,',',1,1740)
-LexToken(NUMBER,'-1',1,1741)
+LexToken(ADDITION,'-',1,1741)
+LexToken(NUMBER,'1',1,1742)
LexToken(COMMA,',',1,1743)
LexToken(DQSTRING,'"vec"',1,1748)
LexToken(COMMA,',',1,1749)
@@ -284,7 +285,7 @@ LexToken(OPENSQBRACKET,'[',1,2156)
LexToken(VAR,'seed_c',1,2157)
LexToken(SEMICOLON,';',1,2163)
LexToken(NUMBER,'0',1,2164)
-LexToken(OPERATOR,'*',1,2165)
+LexToken(MULTIPLICATION,'*',1,2165)
LexToken(VAR,'a',1,2166)
LexToken(OPENBRACKET,'(',1,2167)
LexToken(COLON,':',1,2168)
@@ -368,17 +369,18 @@ LexToken(OPENBRACKET,'(',1,2503)
LexToken(VAR,'rand',1,2504)
LexToken(OPENBRACKET,'(',1,2508)
LexToken(CLOSEBRACKET,')',1,2509)
-LexToken(OPERATOR,'*',1,2510)
+LexToken(MULTIPLICATION,'*',1,2510)
LexToken(OPENBRACKET,'(',1,2511)
LexToken(NUMBER,'10',1,2512)
-LexToken(OPERATOR,'^',1,2514)
+LexToken(MULTIPLICATION,'^',1,2514)
LexToken(NUMBER,'7',1,2515)
-LexToken(NUMBER,'-1',1,2516)
+LexToken(ADDITION,'-',1,2516)
+LexToken(NUMBER,'1',1,2517)
LexToken(CLOSEBRACKET,')',1,2518)
LexToken(CLOSEBRACKET,')',1,2519)
LexToken(SEMICOLON,';',1,2520)
LexToken(NUMBER,'0',1,2521)
-LexToken(OPERATOR,'*',1,2522)
+LexToken(MULTIPLICATION,'*',1,2522)
LexToken(VAR,'a',1,2523)
LexToken(OPENBRACKET,'(',1,2524)
LexToken(COLON,':',1,2525)
diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js
index 5e856563..4648d3e1 100644
--- a/js/Sources/RAND_m.js
+++ b/js/Sources/RAND_m.js
@@ -168,8 +168,10 @@ LexToken(COMMA,',',1,1589)
LexToken(DQSTRING,'"mat"',1,1594)
LexToken(COMMA,',',1,1595)
LexToken(OPENSQBRACKET,'[',1,1596)
-LexToken(NUMBER,'-1',1,1597)
-LexToken(NUMBER,'-2',1,1600)
+LexToken(ADDITION,'-',1,1597)
+LexToken(NUMBER,'1',1,1598)
+LexToken(ADDITION,'-',1,1600)
+LexToken(NUMBER,'2',1,1601)
LexToken(CLOSESQBRACKET,']',1,1602)
LexToken(COMMA,',',1,1603)
LexToken(DQSTRING,'"mat"',1,1608)
@@ -265,7 +267,7 @@ LexToken(NUMBER,'1',1,2013)
LexToken(CLOSEBRACKET,')',1,2014)
LexToken(SEMICOLON,';',1,2015)
LexToken(NUMBER,'0',1,2016)
-LexToken(OPERATOR,'*',1,2017)
+LexToken(MULTIPLICATION,'*',1,2017)
LexToken(VAR,'real',1,2018)
LexToken(OPENBRACKET,'(',1,2022)
LexToken(VAR,'a',1,2023)
@@ -343,7 +345,7 @@ LexToken(COLON,':',1,2280)
LexToken(CLOSEBRACKET,')',1,2281)
LexToken(SEMICOLON,';',1,2282)
LexToken(NUMBER,'0',1,2283)
-LexToken(OPERATOR,'*',1,2284)
+LexToken(MULTIPLICATION,'*',1,2284)
LexToken(OPENSQBRACKET,'[',1,2285)
LexToken(VAR,'real',1,2286)
LexToken(OPENBRACKET,'(',1,2290)
@@ -584,17 +586,18 @@ LexToken(OPENBRACKET,'(',1,3336)
LexToken(VAR,'rand',1,3337)
LexToken(OPENBRACKET,'(',1,3341)
LexToken(CLOSEBRACKET,')',1,3342)
-LexToken(OPERATOR,'*',1,3343)
+LexToken(MULTIPLICATION,'*',1,3343)
LexToken(OPENBRACKET,'(',1,3344)
LexToken(NUMBER,'10',1,3345)
-LexToken(OPERATOR,'^',1,3347)
+LexToken(MULTIPLICATION,'^',1,3347)
LexToken(NUMBER,'7',1,3348)
-LexToken(NUMBER,'-1',1,3349)
+LexToken(ADDITION,'-',1,3349)
+LexToken(NUMBER,'1',1,3350)
LexToken(CLOSEBRACKET,')',1,3351)
LexToken(CLOSEBRACKET,')',1,3352)
LexToken(SEMICOLON,';',1,3353)
LexToken(NUMBER,'0',1,3354)
-LexToken(OPERATOR,'*',1,3355)
+LexToken(MULTIPLICATION,'*',1,3355)
LexToken(VAR,'a',1,3356)
LexToken(OPENBRACKET,'(',1,3357)
LexToken(COLON,':',1,3358)
@@ -687,12 +690,13 @@ LexToken(OPENBRACKET,'(',1,3592)
LexToken(VAR,'rand',1,3593)
LexToken(OPENBRACKET,'(',1,3597)
LexToken(CLOSEBRACKET,')',1,3598)
-LexToken(OPERATOR,'*',1,3599)
+LexToken(MULTIPLICATION,'*',1,3599)
LexToken(OPENBRACKET,'(',1,3600)
LexToken(NUMBER,'10',1,3601)
-LexToken(OPERATOR,'^',1,3603)
+LexToken(MULTIPLICATION,'^',1,3603)
LexToken(NUMBER,'7',1,3604)
-LexToken(NUMBER,'-1',1,3605)
+LexToken(ADDITION,'-',1,3605)
+LexToken(NUMBER,'1',1,3606)
LexToken(CLOSEBRACKET,')',1,3607)
LexToken(CLOSEBRACKET,')',1,3608)
LexToken(CLOSESQBRACKET,']',1,3609)
diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js
index 7f4ca811..5c186737 100644
--- a/js/Sources/READAU_f.js
+++ b/js/Sources/READAU_f.js
@@ -110,7 +110,7 @@ LexToken(EOL,'\n',1,1194)
LexToken(VAR,'imask',1,1203)
LexToken(ASSIGNMENT,'=',1,1208)
LexToken(NUMBER,'9',1,1209)
-LexToken(OPERATOR,'+',1,1210)
+LexToken(ADDITION,'+',1,1210)
LexToken(VAR,'ipar',1,1211)
LexToken(OPENBRACKET,'(',1,1215)
LexToken(NUMBER,'1',1,1216)
@@ -518,26 +518,28 @@ LexToken(CLOSEBRACKET,')',1,3788)
LexToken(COMPARISON,'<>',1,3789)
LexToken(OPENBRACKET,'(',1,3791)
LexToken(VAR,'N',1,3792)
-LexToken(OPERATOR,'*',1,3793)
+LexToken(MULTIPLICATION,'*',1,3793)
LexToken(VAR,'M',1,3794)
LexToken(CLOSEBRACKET,')',1,3795)
-LexToken(OPERATOR,'+',1,3796)
+LexToken(ADDITION,'+',1,3796)
LexToken(NUMBER,'3',1,3797)
LexToken(THEN,'then',1,3799)
LexToken(EOL,'\n',1,3803)
LexToken(VAR,'dstate',1,3828)
LexToken(ASSIGNMENT,'=',1,3834)
LexToken(OPENSQBRACKET,'[',1,3835)
-LexToken(NUMBER,'-1',1,3836)
+LexToken(ADDITION,'-',1,3836)
+LexToken(NUMBER,'1',1,3837)
LexToken(SEMICOLON,';',1,3838)
-LexToken(NUMBER,'-1',1,3839)
+LexToken(ADDITION,'-',1,3839)
+LexToken(NUMBER,'1',1,3840)
LexToken(SEMICOLON,';',1,3841)
LexToken(VAR,'lunit',1,3842)
LexToken(SEMICOLON,';',1,3847)
LexToken(VAR,'zeros',1,3848)
LexToken(OPENBRACKET,'(',1,3853)
LexToken(VAR,'N',1,3854)
-LexToken(OPERATOR,'*',1,3855)
+LexToken(MULTIPLICATION,'*',1,3855)
LexToken(VAR,'M',1,3856)
LexToken(COMMA,',',1,3857)
LexToken(NUMBER,'1',1,3858)
@@ -686,7 +688,7 @@ LexToken(SEMICOLON,';',1,4516)
LexToken(VAR,'zeros',1,4517)
LexToken(OPENBRACKET,'(',1,4522)
LexToken(VAR,'N',1,4523)
-LexToken(OPERATOR,'*',1,4524)
+LexToken(MULTIPLICATION,'*',1,4524)
LexToken(VAR,'M',1,4525)
LexToken(COMMA,',',1,4526)
LexToken(NUMBER,'1',1,4527)
diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js
index 26eee9f1..1840e726 100644
--- a/js/Sources/READC_f.js
+++ b/js/Sources/READC_f.js
@@ -112,7 +112,7 @@ LexToken(EOL,'\n',1,1208)
LexToken(VAR,'imask',1,1217)
LexToken(ASSIGNMENT,'=',1,1223)
LexToken(NUMBER,'9',1,1225)
-LexToken(OPERATOR,'+',1,1226)
+LexToken(ADDITION,'+',1,1226)
LexToken(VAR,'ipar',1,1227)
LexToken(OPENBRACKET,'(',1,1231)
LexToken(NUMBER,'1',1,1232)
@@ -240,11 +240,13 @@ LexToken(VAR,'list',1,1845)
LexToken(OPENBRACKET,'(',1,1849)
LexToken(DQSTRING,'"vec"',1,1854)
LexToken(COMMA,',',1,1855)
-LexToken(NUMBER,'-1',1,1857)
+LexToken(ADDITION,'-',1,1857)
+LexToken(NUMBER,'1',1,1858)
LexToken(COMMA,',',1,1859)
LexToken(DQSTRING,'"vec"',1,1865)
LexToken(COMMA,',',1,1866)
-LexToken(NUMBER,'-1',1,1868)
+LexToken(ADDITION,'-',1,1868)
+LexToken(NUMBER,'1',1,1869)
LexToken(COMMA,',',1,1870)
LexToken(DQSTRING,'"str"',1,1876)
LexToken(COMMA,',',1,1877)
@@ -426,7 +428,7 @@ LexToken(COMMA,',',1,2708)
LexToken(VAR,'gettext',1,2729)
LexToken(OPENBRACKET,'(',1,2736)
LexToken(DQSTRING,'"Valid formats are: "',1,2757)
-LexToken(OPERATOR,'+',1,2759)
+LexToken(ADDITION,'+',1,2759)
LexToken(VAR,'strcat',1,2761)
LexToken(OPENBRACKET,'(',1,2767)
LexToken(VAR,'fmts',1,2768)
@@ -644,12 +646,12 @@ LexToken(VAR,'gettext',1,4240)
LexToken(OPENBRACKET,'(',1,4247)
LexToken(DQSTRING,'"[1, Record Size = "',1,4267)
LexToken(CLOSEBRACKET,')',1,4268)
-LexToken(OPERATOR,'+',1,4270)
+LexToken(ADDITION,'+',1,4270)
LexToken(VAR,'string',1,4272)
LexToken(OPENBRACKET,'(',1,4279)
LexToken(VAR,'M',1,4280)
LexToken(CLOSEBRACKET,')',1,4281)
-LexToken(OPERATOR,'+',1,4282)
+LexToken(ADDITION,'+',1,4282)
LexToken(DQSTRING,'"]"',1,4285)
LexToken(CLOSEBRACKET,')',1,4286)
LexToken(CLOSEBRACKET,')',1,4287)
@@ -721,12 +723,12 @@ LexToken(VAR,'gettext',1,4777)
LexToken(OPENBRACKET,'(',1,4784)
LexToken(DQSTRING,'"[1, Record Size = "',1,4804)
LexToken(CLOSEBRACKET,')',1,4805)
-LexToken(OPERATOR,'+',1,4807)
+LexToken(ADDITION,'+',1,4807)
LexToken(VAR,'string',1,4809)
LexToken(OPENBRACKET,'(',1,4816)
LexToken(VAR,'M',1,4817)
LexToken(CLOSEBRACKET,')',1,4818)
-LexToken(OPERATOR,'+',1,4819)
+LexToken(ADDITION,'+',1,4819)
LexToken(DQSTRING,'"]"',1,4822)
LexToken(CLOSEBRACKET,')',1,4823)
LexToken(CLOSEBRACKET,')',1,4824)
@@ -788,12 +790,12 @@ LexToken(VAR,'gettext',1,5135)
LexToken(OPENBRACKET,'(',1,5142)
LexToken(DQSTRING,'"[1, Record Size = "',1,5162)
LexToken(CLOSEBRACKET,')',1,5163)
-LexToken(OPERATOR,'+',1,5165)
+LexToken(ADDITION,'+',1,5165)
LexToken(VAR,'string',1,5167)
LexToken(OPENBRACKET,'(',1,5174)
LexToken(VAR,'M',1,5175)
LexToken(CLOSEBRACKET,')',1,5176)
-LexToken(OPERATOR,'+',1,5177)
+LexToken(ADDITION,'+',1,5177)
LexToken(DQSTRING,'"]"',1,5180)
LexToken(CLOSEBRACKET,')',1,5181)
LexToken(CLOSEBRACKET,')',1,5182)
@@ -1001,7 +1003,8 @@ LexToken(VAR,'model',1,6406)
LexToken(DOT,'.',1,6411)
LexToken(VAR,'firing',1,6412)
LexToken(ASSIGNMENT,'=',1,6419)
-LexToken(NUMBER,'-1',1,6421)
+LexToken(ADDITION,'-',1,6421)
+LexToken(NUMBER,'1',1,6422)
LexToken(EOL,'\n',1,6423)
LexToken(ELSE,'else',1,6444)
LexToken(EOL,'\n',1,6448)
@@ -1063,26 +1066,28 @@ LexToken(CLOSEBRACKET,')',1,6950)
LexToken(COMPARISON,'<>',1,6952)
LexToken(OPENBRACKET,'(',1,6955)
LexToken(VAR,'N',1,6956)
-LexToken(OPERATOR,'*',1,6957)
+LexToken(MULTIPLICATION,'*',1,6957)
LexToken(VAR,'M',1,6958)
LexToken(CLOSEBRACKET,')',1,6959)
-LexToken(OPERATOR,'+',1,6961)
+LexToken(ADDITION,'+',1,6961)
LexToken(NUMBER,'3',1,6963)
LexToken(THEN,'then',1,6965)
LexToken(EOL,'\n',1,6969)
LexToken(VAR,'dstate',1,6994)
LexToken(ASSIGNMENT,'=',1,7001)
LexToken(OPENSQBRACKET,'[',1,7003)
-LexToken(NUMBER,'-1',1,7004)
+LexToken(ADDITION,'-',1,7004)
+LexToken(NUMBER,'1',1,7005)
LexToken(SEMICOLON,';',1,7006)
-LexToken(NUMBER,'-1',1,7008)
+LexToken(ADDITION,'-',1,7008)
+LexToken(NUMBER,'1',1,7009)
LexToken(SEMICOLON,';',1,7010)
LexToken(VAR,'lunit',1,7012)
LexToken(SEMICOLON,';',1,7017)
LexToken(VAR,'zeros',1,7019)
LexToken(OPENBRACKET,'(',1,7024)
LexToken(VAR,'N',1,7025)
-LexToken(OPERATOR,'*',1,7026)
+LexToken(MULTIPLICATION,'*',1,7026)
LexToken(VAR,'M',1,7027)
LexToken(COMMA,',',1,7028)
LexToken(NUMBER,'1',1,7030)
@@ -1282,7 +1287,7 @@ LexToken(SEMICOLON,';',1,7922)
LexToken(VAR,'zeros',1,7924)
LexToken(OPENBRACKET,'(',1,7929)
LexToken(VAR,'N',1,7930)
-LexToken(OPERATOR,'*',1,7931)
+LexToken(MULTIPLICATION,'*',1,7931)
LexToken(VAR,'M',1,7932)
LexToken(COMMA,',',1,7933)
LexToken(NUMBER,'1',1,7934)
@@ -1336,7 +1341,8 @@ LexToken(VAR,'model',1,8141)
LexToken(DOT,'.',1,8146)
LexToken(VAR,'firing',1,8147)
LexToken(ASSIGNMENT,'=',1,8154)
-LexToken(NUMBER,'-1',1,8156)
+LexToken(ADDITION,'-',1,8156)
+LexToken(NUMBER,'1',1,8157)
LexToken(EOL,'\n',1,8158)
LexToken(VAR,'model',1,8167)
LexToken(DOT,'.',1,8172)
diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js
index e0d02515..a67780b3 100644
--- a/js/Sources/RFILE_f.js
+++ b/js/Sources/RFILE_f.js
@@ -122,12 +122,12 @@ LexToken(EOL,'\n',1,1234)
LexToken(VAR,'imask',1,1243)
LexToken(ASSIGNMENT,'=',1,1249)
LexToken(NUMBER,'5',1,1251)
-LexToken(OPERATOR,'+',1,1252)
+LexToken(ADDITION,'+',1,1252)
LexToken(VAR,'ipar',1,1253)
LexToken(OPENBRACKET,'(',1,1257)
LexToken(NUMBER,'1',1,1258)
LexToken(CLOSEBRACKET,')',1,1259)
-LexToken(OPERATOR,'+',1,1260)
+LexToken(ADDITION,'+',1,1260)
LexToken(VAR,'ipar',1,1261)
LexToken(OPENBRACKET,'(',1,1265)
LexToken(NUMBER,'2',1,1266)
@@ -274,11 +274,13 @@ LexToken(VAR,'list',1,2051)
LexToken(OPENBRACKET,'(',1,2055)
LexToken(DQSTRING,'"vec"',1,2060)
LexToken(COMMA,',',1,2061)
-LexToken(NUMBER,'-1',1,2062)
+LexToken(ADDITION,'-',1,2062)
+LexToken(NUMBER,'1',1,2063)
LexToken(COMMA,',',1,2064)
LexToken(DQSTRING,'"vec"',1,2069)
LexToken(COMMA,',',1,2070)
-LexToken(NUMBER,'-1',1,2071)
+LexToken(ADDITION,'-',1,2071)
+LexToken(NUMBER,'1',1,2072)
LexToken(COMMA,',',1,2073)
LexToken(DQSTRING,'"str"',1,2078)
LexToken(COMMA,',',1,2079)
@@ -849,21 +851,23 @@ LexToken(CLOSEBRACKET,')',1,5900)
LexToken(COMPARISON,'<>',1,5902)
LexToken(OPENBRACKET,'(',1,5905)
LexToken(VAR,'nout',1,5906)
-LexToken(OPERATOR,'+',1,5910)
+LexToken(ADDITION,'+',1,5910)
LexToken(VAR,'ievt',1,5911)
LexToken(CLOSEBRACKET,')',1,5915)
-LexToken(OPERATOR,'*',1,5916)
+LexToken(MULTIPLICATION,'*',1,5916)
LexToken(VAR,'N',1,5917)
-LexToken(OPERATOR,'+',1,5919)
+LexToken(ADDITION,'+',1,5919)
LexToken(NUMBER,'3',1,5921)
LexToken(THEN,'then',1,5923)
LexToken(EOL,'\n',1,5927)
LexToken(VAR,'dstate',1,5952)
LexToken(ASSIGNMENT,'=',1,5959)
LexToken(OPENSQBRACKET,'[',1,5961)
-LexToken(NUMBER,'-1',1,5962)
+LexToken(ADDITION,'-',1,5962)
+LexToken(NUMBER,'1',1,5963)
LexToken(SEMICOLON,';',1,5965)
-LexToken(NUMBER,'-1',1,5967)
+LexToken(ADDITION,'-',1,5967)
+LexToken(NUMBER,'1',1,5968)
LexToken(SEMICOLON,';',1,5969)
LexToken(VAR,'lunit',1,5971)
LexToken(SEMICOLON,';',1,5976)
@@ -871,10 +875,10 @@ LexToken(VAR,'zeros',1,5978)
LexToken(OPENBRACKET,'(',1,5983)
LexToken(OPENBRACKET,'(',1,5984)
LexToken(VAR,'nout',1,5985)
-LexToken(OPERATOR,'+',1,5990)
+LexToken(ADDITION,'+',1,5990)
LexToken(VAR,'ievt',1,5992)
LexToken(CLOSEBRACKET,')',1,5996)
-LexToken(OPERATOR,'*',1,5998)
+LexToken(MULTIPLICATION,'*',1,5998)
LexToken(VAR,'N',1,6000)
LexToken(COMMA,',',1,6001)
LexToken(NUMBER,'1',1,6003)
@@ -1019,7 +1023,7 @@ LexToken(OPENBRACKET,'(',1,6701)
LexToken(OPENBRACKET,'(',1,6702)
LexToken(VAR,'nout',1,6703)
LexToken(CLOSEBRACKET,')',1,6707)
-LexToken(OPERATOR,'*',1,6708)
+LexToken(MULTIPLICATION,'*',1,6708)
LexToken(VAR,'N',1,6709)
LexToken(COMMA,',',1,6710)
LexToken(NUMBER,'1',1,6712)
diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js
index bdf61da6..88949608 100644
--- a/js/Sources/STEP.js
+++ b/js/Sources/STEP.js
@@ -150,11 +150,13 @@ LexToken(NUMBER,'1',1,1423)
LexToken(COMMA,',',1,1424)
LexToken(DQSTRING,'"vec"',1,1429)
LexToken(COMMA,',',1,1430)
-LexToken(NUMBER,'-1',1,1431)
+LexToken(ADDITION,'-',1,1431)
+LexToken(NUMBER,'1',1,1432)
LexToken(COMMA,',',1,1433)
LexToken(DQSTRING,'"vec"',1,1438)
LexToken(COMMA,',',1,1439)
-LexToken(NUMBER,'-1',1,1440)
+LexToken(ADDITION,'-',1,1440)
+LexToken(NUMBER,'1',1,1441)
LexToken(CLOSEBRACKET,')',1,1442)
LexToken(COMMA,',',1,1443)
LexToken(VAR,'exprs',1,1445)
@@ -216,7 +218,7 @@ LexToken(EOL,'\n',1,1634)
LexToken(VAR,'in',1,1655)
LexToken(ASSIGNMENT,'=',1,1657)
LexToken(VAR,'in',1,1658)
-LexToken(OPERATOR,'*',1,1660)
+LexToken(MULTIPLICATION,'*',1,1660)
LexToken(VAR,'ones',1,1661)
LexToken(OPENBRACKET,'(',1,1665)
LexToken(VAR,'fi',1,1666)
@@ -236,7 +238,7 @@ LexToken(EOL,'\n',1,1713)
LexToken(VAR,'fi',1,1734)
LexToken(ASSIGNMENT,'=',1,1736)
LexToken(VAR,'fi',1,1737)
-LexToken(OPERATOR,'*',1,1739)
+LexToken(MULTIPLICATION,'*',1,1739)
LexToken(VAR,'ones',1,1740)
LexToken(OPENBRACKET,'(',1,1744)
LexToken(VAR,'in',1,1745)
diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js
index c45150d5..4fe5cc7a 100644
--- a/js/Sources/STEP_FUNCTION.js
+++ b/js/Sources/STEP_FUNCTION.js
@@ -162,7 +162,7 @@ LexToken(EOL,'\n',1,1358)
LexToken(VAR,'spath',1,1375)
LexToken(OPENBRACKET,'(',1,1380)
LexToken(LASTINDEX,'$',1,1381)
-LexToken(OPERATOR,'+',1,1382)
+LexToken(ADDITION,'+',1,1382)
LexToken(NUMBER,'1',1,1383)
LexToken(CLOSEBRACKET,')',1,1384)
LexToken(ASSIGNMENT,'=',1,1385)
@@ -171,7 +171,7 @@ LexToken(EOL,'\n',1,1393)
LexToken(VAR,'spath',1,1410)
LexToken(OPENBRACKET,'(',1,1415)
LexToken(LASTINDEX,'$',1,1416)
-LexToken(OPERATOR,'+',1,1417)
+LexToken(ADDITION,'+',1,1417)
LexToken(NUMBER,'1',1,1418)
LexToken(CLOSEBRACKET,')',1,1419)
LexToken(ASSIGNMENT,'=',1,1420)
@@ -180,7 +180,7 @@ LexToken(EOL,'\n',1,1427)
LexToken(VAR,'spath',1,1444)
LexToken(OPENBRACKET,'(',1,1449)
LexToken(LASTINDEX,'$',1,1450)
-LexToken(OPERATOR,'+',1,1451)
+LexToken(ADDITION,'+',1,1451)
LexToken(NUMBER,'1',1,1452)
LexToken(CLOSEBRACKET,')',1,1453)
LexToken(ASSIGNMENT,'=',1,1454)
@@ -189,7 +189,7 @@ LexToken(EOL,'\n',1,1461)
LexToken(VAR,'spath',1,1478)
LexToken(OPENBRACKET,'(',1,1483)
LexToken(LASTINDEX,'$',1,1484)
-LexToken(OPERATOR,'+',1,1485)
+LexToken(ADDITION,'+',1,1485)
LexToken(NUMBER,'1',1,1486)
LexToken(CLOSEBRACKET,')',1,1487)
LexToken(ASSIGNMENT,'=',1,1488)
@@ -210,11 +210,11 @@ LexToken(EOL,'\n',1,1555)
LexToken(VAR,'execstr',1,1568)
LexToken(OPENBRACKET,'(',1,1575)
LexToken(DQSTRING,'"xxn="',1,1581)
-LexToken(OPERATOR,'+',1,1582)
+LexToken(ADDITION,'+',1,1582)
LexToken(VAR,'xx',1,1583)
LexToken(DOT,'.',1,1585)
LexToken(VAR,'gui',1,1586)
-LexToken(OPERATOR,'+',1,1589)
+LexToken(ADDITION,'+',1,1589)
LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1603)
LexToken(CLOSEBRACKET,')',1,1604)
LexToken(EOL,'\n',1,1605)
@@ -598,7 +598,7 @@ LexToken(VAR,'size',1,4061)
LexToken(OPENBRACKET,'(',1,4065)
LexToken(VAR,'newpar',1,4066)
LexToken(CLOSEBRACKET,')',1,4072)
-LexToken(OPERATOR,'+',1,4073)
+LexToken(ADDITION,'+',1,4073)
LexToken(NUMBER,'1',1,4074)
LexToken(CLOSEBRACKET,')',1,4075)
LexToken(ASSIGNMENT,'=',1,4076)
@@ -938,8 +938,10 @@ LexToken(ASSIGNMENT,'=',1,5324)
LexToken(OPENSQBRACKET,'[',1,5326)
LexToken(NUMBER,'0',1,5327)
LexToken(NUMBER,'20',1,5329)
-LexToken(NUMBER,'-20',1,5333)
-LexToken(NUMBER,'-20',1,5337)
+LexToken(ADDITION,'-',1,5333)
+LexToken(NUMBER,'20',1,5334)
+LexToken(ADDITION,'-',1,5337)
+LexToken(NUMBER,'20',1,5338)
LexToken(NUMBER,'20',1,5341)
LexToken(NUMBER,'1',1,5344)
LexToken(CLOSESQBRACKET,']',1,5345)
@@ -951,8 +953,10 @@ LexToken(VAR,'yy',1,5360)
LexToken(ASSIGNMENT,'=',1,5363)
LexToken(OPENSQBRACKET,'[',1,5365)
LexToken(NUMBER,'0',1,5366)
-LexToken(NUMBER,'-20',1,5368)
-LexToken(NUMBER,'-20',1,5372)
+LexToken(ADDITION,'-',1,5368)
+LexToken(NUMBER,'20',1,5369)
+LexToken(ADDITION,'-',1,5372)
+LexToken(NUMBER,'20',1,5373)
LexToken(NUMBER,'60',1,5377)
LexToken(NUMBER,'60',1,5380)
LexToken(NUMBER,'1',1,5383)
@@ -966,7 +970,8 @@ LexToken(VAR,'ct',1,5400)
LexToken(ASSIGNMENT,'=',1,5403)
LexToken(OPENSQBRACKET,'[',1,5405)
LexToken(NUMBER,'5',1,5406)
-LexToken(NUMBER,'-1',1,5408)
+LexToken(ADDITION,'-',1,5408)
+LexToken(NUMBER,'1',1,5409)
LexToken(CLOSESQBRACKET,']',1,5410)
LexToken(SEMICOLON,';',1,5411)
LexToken(EOL,'\n',1,5412)
diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js
index 2207710a..aa914278 100644
--- a/js/Sources/SampleCLK.js
+++ b/js/Sources/SampleCLK.js
@@ -229,7 +229,8 @@ LexToken(VAR,'model',1,1830)
LexToken(DOT,'.',1,1835)
LexToken(VAR,'firing',1,1836)
LexToken(ASSIGNMENT,'=',1,1842)
-LexToken(NUMBER,'-1',1,1843)
+LexToken(ADDITION,'-',1,1843)
+LexToken(NUMBER,'1',1,1844)
LexToken(EOL,'\n',1,1860)
LexToken(EOL,'\n',1,1928)
LexToken(EOL,'\n',1,1966)
@@ -310,7 +311,8 @@ LexToken(VAR,'model',1,2484)
LexToken(DOT,'.',1,2489)
LexToken(VAR,'firing',1,2490)
LexToken(ASSIGNMENT,'=',1,2496)
-LexToken(NUMBER,'-1',1,2497)
+LexToken(ADDITION,'-',1,2497)
+LexToken(NUMBER,'1',1,2498)
LexToken(EOL,'\n',1,2499)
LexToken(VAR,'model',1,2508)
LexToken(DOT,'.',1,2513)
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 74c89532..df7f3585 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -178,7 +178,7 @@ LexToken(EOL,'\n',1,1450)
LexToken(VAR,'spath',1,1467)
LexToken(OPENBRACKET,'(',1,1472)
LexToken(LASTINDEX,'$',1,1473)
-LexToken(OPERATOR,'+',1,1474)
+LexToken(ADDITION,'+',1,1474)
LexToken(NUMBER,'1',1,1475)
LexToken(CLOSEBRACKET,')',1,1476)
LexToken(ASSIGNMENT,'=',1,1477)
@@ -187,7 +187,7 @@ LexToken(EOL,'\n',1,1485)
LexToken(VAR,'spath',1,1502)
LexToken(OPENBRACKET,'(',1,1507)
LexToken(LASTINDEX,'$',1,1508)
-LexToken(OPERATOR,'+',1,1509)
+LexToken(ADDITION,'+',1,1509)
LexToken(NUMBER,'1',1,1510)
LexToken(CLOSEBRACKET,')',1,1511)
LexToken(ASSIGNMENT,'=',1,1512)
@@ -196,7 +196,7 @@ LexToken(EOL,'\n',1,1519)
LexToken(VAR,'spath',1,1536)
LexToken(OPENBRACKET,'(',1,1541)
LexToken(LASTINDEX,'$',1,1542)
-LexToken(OPERATOR,'+',1,1543)
+LexToken(ADDITION,'+',1,1543)
LexToken(NUMBER,'1',1,1544)
LexToken(CLOSEBRACKET,')',1,1545)
LexToken(ASSIGNMENT,'=',1,1546)
@@ -205,7 +205,7 @@ LexToken(EOL,'\n',1,1553)
LexToken(VAR,'spath',1,1570)
LexToken(OPENBRACKET,'(',1,1575)
LexToken(LASTINDEX,'$',1,1576)
-LexToken(OPERATOR,'+',1,1577)
+LexToken(ADDITION,'+',1,1577)
LexToken(NUMBER,'1',1,1578)
LexToken(CLOSEBRACKET,')',1,1579)
LexToken(ASSIGNMENT,'=',1,1580)
@@ -226,11 +226,11 @@ LexToken(EOL,'\n',1,1648)
LexToken(VAR,'execstr',1,1661)
LexToken(OPENBRACKET,'(',1,1668)
LexToken(DQSTRING,'"xxn="',1,1674)
-LexToken(OPERATOR,'+',1,1675)
+LexToken(ADDITION,'+',1,1675)
LexToken(VAR,'xx',1,1676)
LexToken(DOT,'.',1,1678)
LexToken(VAR,'gui',1,1679)
-LexToken(OPERATOR,'+',1,1682)
+LexToken(ADDITION,'+',1,1682)
LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1696)
LexToken(CLOSEBRACKET,')',1,1697)
LexToken(EOL,'\n',1,1698)
@@ -723,7 +723,7 @@ LexToken(VAR,'size',1,4277)
LexToken(OPENBRACKET,'(',1,4281)
LexToken(VAR,'newpar',1,4282)
LexToken(CLOSEBRACKET,')',1,4288)
-LexToken(OPERATOR,'+',1,4289)
+LexToken(ADDITION,'+',1,4289)
LexToken(NUMBER,'1',1,4290)
LexToken(CLOSEBRACKET,')',1,4291)
LexToken(ASSIGNMENT,'=',1,4292)
@@ -800,7 +800,8 @@ LexToken(NUMBER,'0.000001',1,4634)
LexToken(SEMICOLON,';',1,4642)
LexToken(NUMBER,'1.000',1,4643)
LexToken(VAR,'D',1,4648)
-LexToken(NUMBER,'-10',1,4649)
+LexToken(ADDITION,'-',1,4649)
+LexToken(NUMBER,'10',1,4650)
LexToken(SEMICOLON,';',1,4652)
LexToken(NUMBER,'100001',1,4653)
LexToken(SEMICOLON,';',1,4659)
@@ -1071,7 +1072,8 @@ LexToken(NUMBER,'10',1,5650)
LexToken(SEMICOLON,';',1,5652)
LexToken(NUMBER,'20',1,5653)
LexToken(SEMICOLON,';',1,5655)
-LexToken(NUMBER,'-30',1,5656)
+LexToken(ADDITION,'-',1,5656)
+LexToken(NUMBER,'30',1,5657)
LexToken(CLOSESQBRACKET,']',1,5659)
LexToken(COMMA,',',1,5660)
LexToken(VAR,'ipar',1,5672)
@@ -1174,7 +1176,8 @@ LexToken(ASSIGNMENT,'=',1,6060)
LexToken(OPENSQBRACKET,'[',1,6061)
LexToken(NUMBER,'5',1,6062)
LexToken(COMMA,',',1,6063)
-LexToken(NUMBER,'-1',1,6064)
+LexToken(ADDITION,'-',1,6064)
+LexToken(NUMBER,'1',1,6065)
LexToken(CLOSESQBRACKET,']',1,6066)
LexToken(COMMA,',',1,6067)
LexToken(VAR,'from',1,6079)
@@ -1476,7 +1479,8 @@ LexToken(ASSIGNMENT,'=',1,7312)
LexToken(OPENSQBRACKET,'[',1,7313)
LexToken(NUMBER,'5',1,7314)
LexToken(COMMA,',',1,7315)
-LexToken(NUMBER,'-1',1,7316)
+LexToken(ADDITION,'-',1,7316)
+LexToken(NUMBER,'1',1,7317)
LexToken(CLOSESQBRACKET,']',1,7318)
LexToken(COMMA,',',1,7319)
LexToken(VAR,'from',1,7331)
@@ -1593,15 +1597,18 @@ LexToken(DQSTRING,'"output"',1,7800)
LexToken(COMMA,',',1,7801)
LexToken(VAR,'in',1,7813)
LexToken(ASSIGNMENT,'=',1,7815)
-LexToken(NUMBER,'-1',1,7816)
+LexToken(ADDITION,'-',1,7816)
+LexToken(NUMBER,'1',1,7817)
LexToken(COMMA,',',1,7818)
LexToken(VAR,'in2',1,7830)
LexToken(ASSIGNMENT,'=',1,7833)
-LexToken(NUMBER,'-2',1,7834)
+LexToken(ADDITION,'-',1,7834)
+LexToken(NUMBER,'2',1,7835)
LexToken(COMMA,',',1,7836)
LexToken(VAR,'intyp',1,7848)
LexToken(ASSIGNMENT,'=',1,7853)
-LexToken(NUMBER,'-1',1,7854)
+LexToken(ADDITION,'-',1,7854)
+LexToken(NUMBER,'1',1,7855)
LexToken(COMMA,',',1,7856)
LexToken(VAR,'out',1,7868)
LexToken(ASSIGNMENT,'=',1,7871)
@@ -2012,7 +2019,8 @@ LexToken(ASSIGNMENT,'=',1,9558)
LexToken(OPENSQBRACKET,'[',1,9559)
LexToken(NUMBER,'5',1,9560)
LexToken(COMMA,',',1,9561)
-LexToken(NUMBER,'-1',1,9562)
+LexToken(ADDITION,'-',1,9562)
+LexToken(NUMBER,'1',1,9563)
LexToken(CLOSESQBRACKET,']',1,9564)
LexToken(COMMA,',',1,9565)
LexToken(VAR,'from',1,9577)
@@ -2060,7 +2068,8 @@ LexToken(NUMBER,'1',1,9716)
LexToken(COMMA,',',1,9717)
LexToken(VAR,'out',1,9729)
LexToken(ASSIGNMENT,'=',1,9732)
-LexToken(NUMBER,'-1',1,9733)
+LexToken(ADDITION,'-',1,9733)
+LexToken(NUMBER,'1',1,9734)
LexToken(COMMA,',',1,9735)
LexToken(VAR,'out2',1,9747)
LexToken(ASSIGNMENT,'=',1,9751)
@@ -2252,7 +2261,8 @@ LexToken(ASSIGNMENT,'=',1,10426)
LexToken(NUMBER,'1',1,10427)
LexToken(COLON,':',1,10428)
LexToken(VAR,'N',1,10429)
-LexToken(NUMBER,'-1',1,10430)
+LexToken(ADDITION,'-',1,10430)
+LexToken(NUMBER,'1',1,10431)
LexToken(EOL,'\n',1,10432)
LexToken(VAR,'X',1,10445)
LexToken(ASSIGNMENT,'=',1,10446)
@@ -2267,14 +2277,14 @@ LexToken(SEMICOLON,';',1,10454)
LexToken(VAR,'x',1,10455)
LexToken(OPENBRACKET,'(',1,10456)
LexToken(VAR,'i',1,10457)
-LexToken(OPERATOR,'+',1,10458)
+LexToken(ADDITION,'+',1,10458)
LexToken(NUMBER,'1',1,10459)
LexToken(CLOSEBRACKET,')',1,10460)
LexToken(SEMICOLON,';',1,10461)
LexToken(VAR,'x',1,10462)
LexToken(OPENBRACKET,'(',1,10463)
LexToken(VAR,'i',1,10464)
-LexToken(OPERATOR,'+',1,10465)
+LexToken(ADDITION,'+',1,10465)
LexToken(NUMBER,'1',1,10466)
LexToken(CLOSEBRACKET,')',1,10467)
LexToken(CLOSESQBRACKET,']',1,10468)
@@ -2298,7 +2308,7 @@ LexToken(SEMICOLON,';',1,10497)
LexToken(VAR,'y',1,10498)
LexToken(OPENBRACKET,'(',1,10499)
LexToken(VAR,'i',1,10500)
-LexToken(OPERATOR,'+',1,10501)
+LexToken(ADDITION,'+',1,10501)
LexToken(NUMBER,'1',1,10502)
LexToken(CLOSEBRACKET,')',1,10503)
LexToken(CLOSESQBRACKET,']',1,10504)
@@ -2429,7 +2439,8 @@ LexToken(ASSIGNMENT,'=',1,11020)
LexToken(NUMBER,'1',1,11021)
LexToken(COLON,':',1,11022)
LexToken(VAR,'N',1,11023)
-LexToken(NUMBER,'-1',1,11024)
+LexToken(ADDITION,'-',1,11024)
+LexToken(NUMBER,'1',1,11025)
LexToken(EOL,'\n',1,11026)
LexToken(VAR,'X',1,11035)
LexToken(ASSIGNMENT,'=',1,11036)
@@ -2446,12 +2457,12 @@ LexToken(COMMA,',',1,11053)
LexToken(VAR,'x',1,11054)
LexToken(OPENBRACKET,'(',1,11055)
LexToken(VAR,'i',1,11056)
-LexToken(OPERATOR,'+',1,11057)
+LexToken(ADDITION,'+',1,11057)
LexToken(NUMBER,'1',1,11058)
LexToken(CLOSEBRACKET,')',1,11059)
LexToken(COMMA,',',1,11060)
LexToken(VAR,'NP',1,11061)
-LexToken(OPERATOR,'+',1,11063)
+LexToken(ADDITION,'+',1,11063)
LexToken(NUMBER,'2',1,11064)
LexToken(CLOSEBRACKET,')',1,11065)
LexToken(TRANSPOSE,"'",1,11066)
@@ -2492,7 +2503,8 @@ LexToken(OPENBRACKET,'(',1,11246)
LexToken(NUMBER,'1',1,11247)
LexToken(COLON,':',1,11248)
LexToken(VAR,'N',1,11249)
-LexToken(NUMBER,'-1',1,11250)
+LexToken(ADDITION,'-',1,11250)
+LexToken(NUMBER,'1',1,11251)
LexToken(CLOSEBRACKET,')',1,11252)
LexToken(SEMICOLON,';',1,11253)
LexToken(EOL,'\n',1,11254)
@@ -2503,9 +2515,10 @@ LexToken(OPENBRACKET,'(',1,11266)
LexToken(VAR,'N',1,11267)
LexToken(COLON,':',1,11268)
LexToken(NUMBER,'2',1,11269)
-LexToken(OPERATOR,'*',1,11270)
+LexToken(MULTIPLICATION,'*',1,11270)
LexToken(VAR,'N',1,11271)
-LexToken(NUMBER,'-2',1,11272)
+LexToken(ADDITION,'-',1,11272)
+LexToken(NUMBER,'2',1,11273)
LexToken(CLOSEBRACKET,')',1,11274)
LexToken(SEMICOLON,';',1,11275)
LexToken(EOL,'\n',1,11276)
@@ -2514,14 +2527,16 @@ LexToken(ASSIGNMENT,'=',1,11286)
LexToken(VAR,'Z',1,11287)
LexToken(OPENBRACKET,'(',1,11288)
LexToken(NUMBER,'2',1,11289)
-LexToken(OPERATOR,'*',1,11290)
+LexToken(MULTIPLICATION,'*',1,11290)
LexToken(VAR,'N',1,11291)
-LexToken(NUMBER,'-1',1,11292)
+LexToken(ADDITION,'-',1,11292)
+LexToken(NUMBER,'1',1,11293)
LexToken(COLON,':',1,11294)
LexToken(NUMBER,'3',1,11295)
-LexToken(OPERATOR,'*',1,11296)
+LexToken(MULTIPLICATION,'*',1,11296)
LexToken(VAR,'N',1,11297)
-LexToken(NUMBER,'-3',1,11298)
+LexToken(ADDITION,'-',1,11298)
+LexToken(NUMBER,'3',1,11299)
LexToken(CLOSEBRACKET,')',1,11300)
LexToken(SEMICOLON,';',1,11301)
LexToken(EOL,'\n',1,11302)
@@ -2542,9 +2557,11 @@ LexToken(FOR,'for',1,11344)
LexToken(VAR,'i',1,11348)
LexToken(ASSIGNMENT,'=',1,11349)
LexToken(VAR,'N',1,11350)
-LexToken(NUMBER,'-1',1,11351)
+LexToken(ADDITION,'-',1,11351)
+LexToken(NUMBER,'1',1,11352)
LexToken(COLON,':',1,11353)
-LexToken(NUMBER,'-1',1,11354)
+LexToken(ADDITION,'-',1,11354)
+LexToken(NUMBER,'1',1,11355)
LexToken(COLON,':',1,11356)
LexToken(NUMBER,'1',1,11357)
LexToken(EOL,'\n',1,11358)
@@ -2575,38 +2592,38 @@ LexToken(VAR,'A',1,11437)
LexToken(OPENBRACKET,'(',1,11438)
LexToken(VAR,'i',1,11439)
LexToken(CLOSEBRACKET,')',1,11440)
-LexToken(OPERATOR,'*',1,11441)
+LexToken(MULTIPLICATION,'*',1,11441)
LexToken(OPENBRACKET,'(',1,11442)
LexToken(VAR,'X',1,11443)
LexToken(OPENBRACKET,'(',1,11444)
LexToken(VAR,'j',1,11445)
LexToken(CLOSEBRACKET,')',1,11446)
-LexToken(OPERATOR,'-',1,11447)
+LexToken(ADDITION,'-',1,11447)
LexToken(VAR,'x',1,11448)
LexToken(OPENBRACKET,'(',1,11449)
LexToken(VAR,'i',1,11450)
LexToken(CLOSEBRACKET,')',1,11451)
LexToken(CLOSEBRACKET,')',1,11452)
-LexToken(OPERATOR,'^',1,11453)
+LexToken(MULTIPLICATION,'^',1,11453)
LexToken(NUMBER,'2',1,11454)
-LexToken(OPERATOR,'+',1,11455)
+LexToken(ADDITION,'+',1,11455)
LexToken(VAR,'B',1,11456)
LexToken(OPENBRACKET,'(',1,11457)
LexToken(VAR,'i',1,11458)
LexToken(CLOSEBRACKET,')',1,11459)
-LexToken(OPERATOR,'*',1,11460)
+LexToken(MULTIPLICATION,'*',1,11460)
LexToken(OPENBRACKET,'(',1,11461)
LexToken(VAR,'X',1,11462)
LexToken(OPENBRACKET,'(',1,11463)
LexToken(VAR,'j',1,11464)
LexToken(CLOSEBRACKET,')',1,11465)
-LexToken(OPERATOR,'-',1,11466)
+LexToken(ADDITION,'-',1,11466)
LexToken(VAR,'x',1,11467)
LexToken(OPENBRACKET,'(',1,11468)
LexToken(VAR,'i',1,11469)
LexToken(CLOSEBRACKET,')',1,11470)
LexToken(CLOSEBRACKET,')',1,11471)
-LexToken(OPERATOR,'+',1,11472)
+LexToken(ADDITION,'+',1,11472)
LexToken(VAR,'C',1,11473)
LexToken(OPENBRACKET,'(',1,11474)
LexToken(VAR,'i',1,11475)
@@ -2621,7 +2638,8 @@ LexToken(VAR,'matrix',1,11505)
LexToken(OPENBRACKET,'(',1,11511)
LexToken(VAR,'Z',1,11512)
LexToken(COMMA,',',1,11513)
-LexToken(NUMBER,'-1',1,11514)
+LexToken(ADDITION,'-',1,11514)
+LexToken(NUMBER,'1',1,11515)
LexToken(COMMA,',',1,11516)
LexToken(NUMBER,'1',1,11517)
LexToken(CLOSEBRACKET,')',1,11518)
@@ -2678,7 +2696,7 @@ LexToken(EOL,'\n',1,11732)
LexToken(VAR,'xinfo',1,11745)
LexToken(OPENBRACKET,'(',1,11750)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,11769)
-LexToken(OPERATOR,'+',1,11770)
+LexToken(ADDITION,'+',1,11770)
LexToken(VAR,'METHOD',1,11771)
LexToken(CLOSEBRACKET,')',1,11777)
LexToken(EOL,'\n',1,11778)
@@ -2761,7 +2779,7 @@ LexToken(EOL,'\n',1,12062)
LexToken(VAR,'xinfo',1,12075)
LexToken(OPENBRACKET,'(',1,12080)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12099)
-LexToken(OPERATOR,'+',1,12100)
+LexToken(ADDITION,'+',1,12100)
LexToken(VAR,'METHOD',1,12101)
LexToken(CLOSEBRACKET,')',1,12107)
LexToken(EOL,'\n',1,12108)
@@ -2819,7 +2837,7 @@ LexToken(EOL,'\n',1,12332)
LexToken(VAR,'xinfo',1,12345)
LexToken(OPENBRACKET,'(',1,12350)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12369)
-LexToken(OPERATOR,'+',1,12370)
+LexToken(ADDITION,'+',1,12370)
LexToken(VAR,'METHOD',1,12371)
LexToken(CLOSEBRACKET,')',1,12377)
LexToken(EOL,'\n',1,12378)
@@ -2878,7 +2896,7 @@ LexToken(EOL,'\n',1,12598)
LexToken(VAR,'xinfo',1,12611)
LexToken(OPENBRACKET,'(',1,12616)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12636)
-LexToken(OPERATOR,'+',1,12637)
+LexToken(ADDITION,'+',1,12637)
LexToken(VAR,'METHOD',1,12638)
LexToken(CLOSEBRACKET,')',1,12644)
LexToken(EOL,'\n',1,12645)
@@ -2942,7 +2960,7 @@ LexToken(EOL,'\n',1,12873)
LexToken(VAR,'xinfo',1,12886)
LexToken(OPENBRACKET,'(',1,12891)
LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12910)
-LexToken(OPERATOR,'+',1,12911)
+LexToken(ADDITION,'+',1,12911)
LexToken(VAR,'METHOD',1,12912)
LexToken(CLOSEBRACKET,')',1,12918)
LexToken(EOL,'\n',1,12919)
@@ -3055,7 +3073,8 @@ LexToken(VAR,'x',1,13338)
LexToken(COMMA,',',1,13339)
LexToken(DQSTRING,'"*"',1,13342)
LexToken(CLOSEBRACKET,')',1,13343)
-LexToken(NUMBER,'-1',1,13344)
+LexToken(ADDITION,'-',1,13344)
+LexToken(NUMBER,'1',1,13345)
LexToken(SEMICOLON,';',1,13346)
LexToken(EOL,'\n',1,13347)
LexToken(VAR,'A',1,13352)
@@ -3063,12 +3082,13 @@ LexToken(ASSIGNMENT,'=',1,13353)
LexToken(VAR,'zeros',1,13354)
LexToken(OPENBRACKET,'(',1,13359)
LexToken(NUMBER,'3',1,13360)
-LexToken(OPERATOR,'*',1,13361)
+LexToken(MULTIPLICATION,'*',1,13361)
LexToken(VAR,'N',1,13362)
-LexToken(NUMBER,'-1',1,13363)
+LexToken(ADDITION,'-',1,13363)
+LexToken(NUMBER,'1',1,13364)
LexToken(COMMA,',',1,13365)
LexToken(VAR,'N',1,13366)
-LexToken(OPERATOR,'*',1,13367)
+LexToken(MULTIPLICATION,'*',1,13367)
LexToken(NUMBER,'3',1,13368)
LexToken(CLOSEBRACKET,')',1,13369)
LexToken(SEMICOLON,';',1,13370)
@@ -3078,9 +3098,10 @@ LexToken(ASSIGNMENT,'=',1,13377)
LexToken(VAR,'zeros',1,13378)
LexToken(OPENBRACKET,'(',1,13383)
LexToken(NUMBER,'3',1,13384)
-LexToken(OPERATOR,'*',1,13385)
+LexToken(MULTIPLICATION,'*',1,13385)
LexToken(VAR,'N',1,13386)
-LexToken(NUMBER,'-1',1,13387)
+LexToken(ADDITION,'-',1,13387)
+LexToken(NUMBER,'1',1,13388)
LexToken(COMMA,',',1,13389)
LexToken(NUMBER,'1',1,13390)
LexToken(CLOSEBRACKET,')',1,13391)
@@ -3096,12 +3117,13 @@ LexToken(EOL,'\n',1,13407)
LexToken(VAR,'j',1,13416)
LexToken(ASSIGNMENT,'=',1,13417)
LexToken(NUMBER,'3',1,13418)
-LexToken(OPERATOR,'*',1,13419)
+LexToken(MULTIPLICATION,'*',1,13419)
LexToken(OPENBRACKET,'(',1,13420)
LexToken(VAR,'i',1,13421)
-LexToken(NUMBER,'-1',1,13422)
+LexToken(ADDITION,'-',1,13422)
+LexToken(NUMBER,'1',1,13423)
LexToken(CLOSEBRACKET,')',1,13424)
-LexToken(OPERATOR,'+',1,13425)
+LexToken(ADDITION,'+',1,13425)
LexToken(NUMBER,'1',1,13426)
LexToken(SEMICOLON,';',1,13427)
LexToken(EOL,'\n',1,13428)
@@ -3110,9 +3132,9 @@ LexToken(OPENBRACKET,'(',1,13438)
LexToken(VAR,'j',1,13439)
LexToken(COMMA,',',1,13440)
LexToken(VAR,'i',1,13441)
-LexToken(OPERATOR,'+',1,13442)
+LexToken(ADDITION,'+',1,13442)
LexToken(NUMBER,'2',1,13443)
-LexToken(OPERATOR,'*',1,13444)
+LexToken(MULTIPLICATION,'*',1,13444)
LexToken(VAR,'N',1,13445)
LexToken(CLOSEBRACKET,')',1,13446)
LexToken(ASSIGNMENT,'=',1,13447)
@@ -3133,7 +3155,7 @@ LexToken(EOL,'\n',1,13469)
LexToken(VAR,'A',1,13478)
LexToken(OPENBRACKET,'(',1,13479)
LexToken(VAR,'j',1,13480)
-LexToken(OPERATOR,'+',1,13481)
+LexToken(ADDITION,'+',1,13481)
LexToken(NUMBER,'1',1,13482)
LexToken(COMMA,',',1,13483)
LexToken(VAR,'i',1,13484)
@@ -3143,37 +3165,37 @@ LexToken(OPENBRACKET,'(',1,13487)
LexToken(VAR,'x',1,13488)
LexToken(OPENBRACKET,'(',1,13489)
LexToken(VAR,'i',1,13490)
-LexToken(OPERATOR,'+',1,13491)
+LexToken(ADDITION,'+',1,13491)
LexToken(NUMBER,'1',1,13492)
LexToken(CLOSEBRACKET,')',1,13493)
-LexToken(OPERATOR,'-',1,13494)
+LexToken(ADDITION,'-',1,13494)
LexToken(VAR,'x',1,13495)
LexToken(OPENBRACKET,'(',1,13496)
LexToken(VAR,'i',1,13497)
LexToken(CLOSEBRACKET,')',1,13498)
LexToken(CLOSEBRACKET,')',1,13499)
-LexToken(OPERATOR,'^',1,13500)
+LexToken(MULTIPLICATION,'^',1,13500)
LexToken(NUMBER,'2',1,13501)
LexToken(SEMICOLON,';',1,13502)
LexToken(EOL,'\n',1,13503)
LexToken(VAR,'A',1,13512)
LexToken(OPENBRACKET,'(',1,13513)
LexToken(VAR,'j',1,13514)
-LexToken(OPERATOR,'+',1,13515)
+LexToken(ADDITION,'+',1,13515)
LexToken(NUMBER,'1',1,13516)
LexToken(COMMA,',',1,13517)
LexToken(VAR,'i',1,13518)
-LexToken(OPERATOR,'+',1,13519)
+LexToken(ADDITION,'+',1,13519)
LexToken(VAR,'N',1,13520)
LexToken(CLOSEBRACKET,')',1,13521)
LexToken(ASSIGNMENT,'=',1,13522)
LexToken(VAR,'x',1,13523)
LexToken(OPENBRACKET,'(',1,13524)
LexToken(VAR,'i',1,13525)
-LexToken(OPERATOR,'+',1,13526)
+LexToken(ADDITION,'+',1,13526)
LexToken(NUMBER,'1',1,13527)
LexToken(CLOSEBRACKET,')',1,13528)
-LexToken(OPERATOR,'-',1,13529)
+LexToken(ADDITION,'-',1,13529)
LexToken(VAR,'x',1,13530)
LexToken(OPENBRACKET,'(',1,13531)
LexToken(VAR,'i',1,13532)
@@ -3183,13 +3205,13 @@ LexToken(EOL,'\n',1,13535)
LexToken(VAR,'A',1,13544)
LexToken(OPENBRACKET,'(',1,13545)
LexToken(VAR,'j',1,13546)
-LexToken(OPERATOR,'+',1,13547)
+LexToken(ADDITION,'+',1,13547)
LexToken(NUMBER,'1',1,13548)
LexToken(COMMA,',',1,13549)
LexToken(VAR,'i',1,13550)
-LexToken(OPERATOR,'+',1,13551)
+LexToken(ADDITION,'+',1,13551)
LexToken(NUMBER,'2',1,13552)
-LexToken(OPERATOR,'*',1,13553)
+LexToken(MULTIPLICATION,'*',1,13553)
LexToken(VAR,'N',1,13554)
LexToken(CLOSEBRACKET,')',1,13555)
LexToken(ASSIGNMENT,'=',1,13556)
@@ -3199,14 +3221,14 @@ LexToken(EOL,'\n',1,13559)
LexToken(VAR,'B',1,13568)
LexToken(OPENBRACKET,'(',1,13569)
LexToken(VAR,'j',1,13570)
-LexToken(OPERATOR,'+',1,13571)
+LexToken(ADDITION,'+',1,13571)
LexToken(NUMBER,'1',1,13572)
LexToken(CLOSEBRACKET,')',1,13573)
LexToken(ASSIGNMENT,'=',1,13574)
LexToken(VAR,'y',1,13575)
LexToken(OPENBRACKET,'(',1,13576)
LexToken(VAR,'i',1,13577)
-LexToken(OPERATOR,'+',1,13578)
+LexToken(ADDITION,'+',1,13578)
LexToken(NUMBER,'1',1,13579)
LexToken(CLOSEBRACKET,')',1,13580)
LexToken(SEMICOLON,';',1,13581)
@@ -3220,39 +3242,41 @@ LexToken(ASSIGNMENT,'=',1,13601)
LexToken(NUMBER,'1',1,13602)
LexToken(COLON,':',1,13603)
LexToken(VAR,'N',1,13604)
-LexToken(NUMBER,'-1',1,13605)
+LexToken(ADDITION,'-',1,13605)
+LexToken(NUMBER,'1',1,13606)
LexToken(EOL,'\n',1,13607)
LexToken(VAR,'j',1,13616)
LexToken(ASSIGNMENT,'=',1,13617)
LexToken(NUMBER,'3',1,13618)
-LexToken(OPERATOR,'*',1,13619)
+LexToken(MULTIPLICATION,'*',1,13619)
LexToken(OPENBRACKET,'(',1,13620)
LexToken(VAR,'i',1,13621)
-LexToken(NUMBER,'-1',1,13622)
+LexToken(ADDITION,'-',1,13622)
+LexToken(NUMBER,'1',1,13623)
LexToken(CLOSEBRACKET,')',1,13624)
-LexToken(OPERATOR,'+',1,13625)
+LexToken(ADDITION,'+',1,13625)
LexToken(NUMBER,'1',1,13626)
LexToken(SEMICOLON,';',1,13627)
LexToken(EOL,'\n',1,13628)
LexToken(VAR,'A',1,13637)
LexToken(OPENBRACKET,'(',1,13638)
LexToken(VAR,'j',1,13639)
-LexToken(OPERATOR,'+',1,13640)
+LexToken(ADDITION,'+',1,13640)
LexToken(NUMBER,'2',1,13641)
LexToken(COMMA,',',1,13642)
LexToken(VAR,'i',1,13643)
LexToken(CLOSEBRACKET,')',1,13644)
LexToken(ASSIGNMENT,'=',1,13645)
LexToken(NUMBER,'2',1,13646)
-LexToken(OPERATOR,'*',1,13647)
+LexToken(MULTIPLICATION,'*',1,13647)
LexToken(OPENBRACKET,'(',1,13648)
LexToken(VAR,'x',1,13649)
LexToken(OPENBRACKET,'(',1,13650)
LexToken(VAR,'i',1,13651)
-LexToken(OPERATOR,'+',1,13652)
+LexToken(ADDITION,'+',1,13652)
LexToken(NUMBER,'1',1,13653)
LexToken(CLOSEBRACKET,')',1,13654)
-LexToken(OPERATOR,'-',1,13655)
+LexToken(ADDITION,'-',1,13655)
LexToken(VAR,'x',1,13656)
LexToken(OPENBRACKET,'(',1,13657)
LexToken(VAR,'i',1,13658)
@@ -3263,11 +3287,11 @@ LexToken(EOL,'\n',1,13662)
LexToken(VAR,'A',1,13671)
LexToken(OPENBRACKET,'(',1,13672)
LexToken(VAR,'j',1,13673)
-LexToken(OPERATOR,'+',1,13674)
+LexToken(ADDITION,'+',1,13674)
LexToken(NUMBER,'2',1,13675)
LexToken(COMMA,',',1,13676)
LexToken(VAR,'i',1,13677)
-LexToken(OPERATOR,'+',1,13678)
+LexToken(ADDITION,'+',1,13678)
LexToken(VAR,'N',1,13679)
LexToken(CLOSEBRACKET,')',1,13680)
LexToken(ASSIGNMENT,'=',1,13681)
@@ -3277,17 +3301,18 @@ LexToken(EOL,'\n',1,13684)
LexToken(VAR,'A',1,13693)
LexToken(OPENBRACKET,'(',1,13694)
LexToken(VAR,'j',1,13695)
-LexToken(OPERATOR,'+',1,13696)
+LexToken(ADDITION,'+',1,13696)
LexToken(NUMBER,'2',1,13697)
LexToken(COMMA,',',1,13698)
LexToken(VAR,'i',1,13699)
-LexToken(OPERATOR,'+',1,13700)
+LexToken(ADDITION,'+',1,13700)
LexToken(VAR,'N',1,13701)
-LexToken(OPERATOR,'+',1,13702)
+LexToken(ADDITION,'+',1,13702)
LexToken(NUMBER,'1',1,13703)
LexToken(CLOSEBRACKET,')',1,13704)
LexToken(ASSIGNMENT,'=',1,13705)
-LexToken(NUMBER,'-1',1,13706)
+LexToken(ADDITION,'-',1,13706)
+LexToken(NUMBER,'1',1,13707)
LexToken(SEMICOLON,';',1,13708)
LexToken(EOL,'\n',1,13709)
LexToken(END,'end',1,13714)
@@ -3298,11 +3323,11 @@ LexToken(ASSIGNMENT,'=',1,13724)
LexToken(VAR,'zeros',1,13725)
LexToken(OPENBRACKET,'(',1,13730)
LexToken(NUMBER,'3',1,13731)
-LexToken(OPERATOR,'*',1,13732)
+LexToken(MULTIPLICATION,'*',1,13732)
LexToken(VAR,'N',1,13733)
LexToken(COMMA,',',1,13734)
LexToken(NUMBER,'3',1,13735)
-LexToken(OPERATOR,'*',1,13736)
+LexToken(MULTIPLICATION,'*',1,13736)
LexToken(VAR,'N',1,13737)
LexToken(CLOSEBRACKET,')',1,13738)
LexToken(SEMICOLON,';',1,13739)
@@ -3322,21 +3347,21 @@ LexToken(VAR,'i',1,13767)
LexToken(CLOSEBRACKET,')',1,13768)
LexToken(ASSIGNMENT,'=',1,13769)
LexToken(NUMBER,'4',1,13770)
-LexToken(OPERATOR,'*',1,13771)
+LexToken(MULTIPLICATION,'*',1,13771)
LexToken(OPENBRACKET,'(',1,13772)
LexToken(VAR,'x',1,13773)
LexToken(OPENBRACKET,'(',1,13774)
LexToken(VAR,'i',1,13775)
-LexToken(OPERATOR,'+',1,13776)
+LexToken(ADDITION,'+',1,13776)
LexToken(NUMBER,'1',1,13777)
LexToken(CLOSEBRACKET,')',1,13778)
-LexToken(OPERATOR,'-',1,13779)
+LexToken(ADDITION,'-',1,13779)
LexToken(VAR,'x',1,13780)
LexToken(OPENBRACKET,'(',1,13781)
LexToken(VAR,'i',1,13782)
LexToken(CLOSEBRACKET,')',1,13783)
LexToken(CLOSEBRACKET,')',1,13784)
-LexToken(OPERATOR,'^',1,13785)
+LexToken(MULTIPLICATION,'^',1,13785)
LexToken(NUMBER,'2',1,13786)
LexToken(EOL,'\n',1,13787)
LexToken(VAR,'Q',1,13796)
@@ -3344,20 +3369,20 @@ LexToken(OPENBRACKET,'(',1,13797)
LexToken(VAR,'i',1,13798)
LexToken(COMMA,',',1,13799)
LexToken(VAR,'i',1,13800)
-LexToken(OPERATOR,'+',1,13801)
+LexToken(ADDITION,'+',1,13801)
LexToken(VAR,'N',1,13802)
LexToken(CLOSEBRACKET,')',1,13803)
LexToken(ASSIGNMENT,'=',1,13804)
LexToken(NUMBER,'2',1,13805)
-LexToken(OPERATOR,'*',1,13806)
+LexToken(MULTIPLICATION,'*',1,13806)
LexToken(OPENBRACKET,'(',1,13807)
LexToken(VAR,'x',1,13808)
LexToken(OPENBRACKET,'(',1,13809)
LexToken(VAR,'i',1,13810)
-LexToken(OPERATOR,'+',1,13811)
+LexToken(ADDITION,'+',1,13811)
LexToken(NUMBER,'1',1,13812)
LexToken(CLOSEBRACKET,')',1,13813)
-LexToken(OPERATOR,'-',1,13814)
+LexToken(ADDITION,'-',1,13814)
LexToken(VAR,'x',1,13815)
LexToken(OPENBRACKET,'(',1,13816)
LexToken(VAR,'i',1,13817)
@@ -3367,22 +3392,22 @@ LexToken(EOL,'\n',1,13820)
LexToken(VAR,'Q',1,13829)
LexToken(OPENBRACKET,'(',1,13830)
LexToken(VAR,'i',1,13831)
-LexToken(OPERATOR,'+',1,13832)
+LexToken(ADDITION,'+',1,13832)
LexToken(VAR,'N',1,13833)
LexToken(COMMA,',',1,13834)
LexToken(VAR,'i',1,13835)
LexToken(CLOSEBRACKET,')',1,13836)
LexToken(ASSIGNMENT,'=',1,13837)
LexToken(NUMBER,'2',1,13838)
-LexToken(OPERATOR,'*',1,13839)
+LexToken(MULTIPLICATION,'*',1,13839)
LexToken(OPENBRACKET,'(',1,13840)
LexToken(VAR,'x',1,13841)
LexToken(OPENBRACKET,'(',1,13842)
LexToken(VAR,'i',1,13843)
-LexToken(OPERATOR,'+',1,13844)
+LexToken(ADDITION,'+',1,13844)
LexToken(NUMBER,'1',1,13845)
LexToken(CLOSEBRACKET,')',1,13846)
-LexToken(OPERATOR,'-',1,13847)
+LexToken(ADDITION,'-',1,13847)
LexToken(VAR,'x',1,13848)
LexToken(OPENBRACKET,'(',1,13849)
LexToken(VAR,'i',1,13850)
@@ -3392,11 +3417,11 @@ LexToken(EOL,'\n',1,13853)
LexToken(VAR,'Q',1,13862)
LexToken(OPENBRACKET,'(',1,13863)
LexToken(VAR,'i',1,13864)
-LexToken(OPERATOR,'+',1,13865)
+LexToken(ADDITION,'+',1,13865)
LexToken(VAR,'N',1,13866)
LexToken(COMMA,',',1,13867)
LexToken(VAR,'i',1,13868)
-LexToken(OPERATOR,'+',1,13869)
+LexToken(ADDITION,'+',1,13869)
LexToken(VAR,'N',1,13870)
LexToken(CLOSEBRACKET,')',1,13871)
LexToken(ASSIGNMENT,'=',1,13872)
@@ -3419,14 +3444,16 @@ LexToken(COMMA,',',1,13899)
LexToken(VAR,'zeros',1,13900)
LexToken(OPENBRACKET,'(',1,13905)
LexToken(NUMBER,'3',1,13906)
-LexToken(OPERATOR,'*',1,13907)
+LexToken(MULTIPLICATION,'*',1,13907)
LexToken(VAR,'N',1,13908)
-LexToken(NUMBER,'-1',1,13909)
+LexToken(ADDITION,'-',1,13909)
+LexToken(NUMBER,'1',1,13910)
LexToken(COMMA,',',1,13911)
LexToken(NUMBER,'3',1,13912)
-LexToken(OPERATOR,'*',1,13913)
+LexToken(MULTIPLICATION,'*',1,13913)
LexToken(VAR,'N',1,13914)
-LexToken(NUMBER,'-1',1,13915)
+LexToken(ADDITION,'-',1,13915)
+LexToken(NUMBER,'1',1,13916)
LexToken(CLOSEBRACKET,')',1,13917)
LexToken(CLOSESQBRACKET,']',1,13918)
LexToken(EOL,'\n',1,13919)
@@ -3436,7 +3463,7 @@ LexToken(OPENSQBRACKET,'[',1,13927)
LexToken(VAR,'zeros',1,13928)
LexToken(OPENBRACKET,'(',1,13933)
LexToken(NUMBER,'3',1,13934)
-LexToken(OPERATOR,'*',1,13935)
+LexToken(MULTIPLICATION,'*',1,13935)
LexToken(VAR,'N',1,13936)
LexToken(COMMA,',',1,13937)
LexToken(NUMBER,'1',1,13938)
@@ -3448,7 +3475,7 @@ LexToken(EOL,'\n',1,13943)
LexToken(VAR,'Zt',1,13948)
LexToken(ASSIGNMENT,'=',1,13950)
LexToken(VAR,'At',1,13951)
-LexToken(OPERATOR,'\\',1,13953)
+LexToken(MULTIPLICATION,'\\',1,13953)
LexToken(VAR,'Bt',1,13954)
LexToken(SEMICOLON,';',1,13956)
LexToken(EOL,'\n',1,13957)
@@ -3459,7 +3486,7 @@ LexToken(OPENBRACKET,'(',1,13966)
LexToken(NUMBER,'1',1,13967)
LexToken(COLON,':',1,13968)
LexToken(NUMBER,'3',1,13969)
-LexToken(OPERATOR,'*',1,13970)
+LexToken(MULTIPLICATION,'*',1,13970)
LexToken(VAR,'N',1,13971)
LexToken(COMMA,',',1,13972)
LexToken(NUMBER,'1',1,13973)
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index 3c627d1e..589c3c30 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -175,7 +175,8 @@ LexToken(THEN,'then',1,1537)
LexToken(EOL,'\n',1,1541)
LexToken(VAR,'a',1,1550)
LexToken(ASSIGNMENT,'=',1,1551)
-LexToken(NUMBER,'-10',1,1552)
+LexToken(ADDITION,'-',1,1552)
+LexToken(NUMBER,'10',1,1553)
LexToken(SEMICOLON,';',1,1555)
LexToken(EOL,'\n',1,1556)
LexToken(VAR,'b',1,1565)
generated by cgit (git 2.34.1) at 2025-03-13 10:16:07 +0000