diff options
| author | Sunil Shetye | 2018-06-13 13:05:27 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-06-14 10:35:53 +0530 |
| commit | 1df154abb3a2be1de529b3c06701f8c7485de1d0 (patch) | |
| tree | 13737bf005cbfc16bb43f920b6e893a1db554f59 /js/Misc | |
| parent | ca2033026a6877d08135bad6622165a9075b50da (diff) | |
| download | sci2js-1df154abb3a2be1de529b3c06701f8c7485de1d0.tar.gz sci2js-1df154abb3a2be1de529b3c06701f8c7485de1d0.tar.bz2 sci2js-1df154abb3a2be1de529b3c06701f8c7485de1d0.zip | |
add make rules for generating debug files
Diffstat (limited to 'js/Misc')
33 files changed, 1212 insertions, 1047 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 61db6e19..f448432f 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -134,13 +134,13 @@ LexToken(EOL,'\n',1,1262) LexToken(VAR,'MSG',1,1275) LexToken(ASSIGNMENT,'=',1,1278) LexToken(VAR,'MSG0',1,1279) -LexToken(OPERATOR,'+',1,1283) +LexToken(ADDITION,'+',1,1283) LexToken(DQSTRING,'"1"',1,1286) -LexToken(OPERATOR,'+',1,1287) +LexToken(ADDITION,'+',1,1287) LexToken(VAR,'MSG2',1,1288) -LexToken(OPERATOR,'+',1,1292) +LexToken(ADDITION,'+',1,1292) LexToken(DQSTRING,'"1"',1,1295) -LexToken(OPERATOR,'+',1,1296) +LexToken(ADDITION,'+',1,1296) LexToken(VAR,'MSG3',1,1297) LexToken(SEMICOLON,';',1,1301) LexToken(EOL,'\n',1,1302) @@ -159,11 +159,11 @@ LexToken(EOL,'\n',1,1362) LexToken(VAR,'CX',1,1379) LexToken(ASSIGNMENT,'=',1,1381) LexToken(VAR,'CX',1,1382) -LexToken(OPERATOR,'+',1,1384) +LexToken(ADDITION,'+',1,1384) LexToken(DQSTRING,'","',1,1387) -LexToken(OPERATOR,'+',1,1388) +LexToken(ADDITION,'+',1,1388) LexToken(DQSTRING,'"C"',1,1391) -LexToken(OPERATOR,'+',1,1392) +LexToken(ADDITION,'+',1,1392) LexToken(VAR,'string',1,1393) LexToken(OPENBRACKET,'(',1,1399) LexToken(VAR,'i',1,1400) @@ -173,32 +173,32 @@ LexToken(EOL,'\n',1,1403) LexToken(VAR,'MSG',1,1420) LexToken(ASSIGNMENT,'=',1,1423) LexToken(VAR,'MSG',1,1424) -LexToken(OPERATOR,'+',1,1427) +LexToken(ADDITION,'+',1,1427) LexToken(DQSTRING,'";"',1,1430) -LexToken(OPERATOR,'+',1,1431) +LexToken(ADDITION,'+',1,1431) LexToken(VAR,'MSG0',1,1432) -LexToken(OPERATOR,'+',1,1436) +LexToken(ADDITION,'+',1,1436) LexToken(VAR,'string',1,1437) LexToken(OPENBRACKET,'(',1,1443) LexToken(VAR,'i',1,1444) LexToken(CLOSEBRACKET,')',1,1445) -LexToken(OPERATOR,'+',1,1446) +LexToken(ADDITION,'+',1,1446) LexToken(VAR,'MSG2',1,1447) -LexToken(OPERATOR,'+',1,1451) +LexToken(ADDITION,'+',1,1451) LexToken(VAR,'string',1,1452) LexToken(OPENBRACKET,'(',1,1458) LexToken(VAR,'i',1,1459) LexToken(CLOSEBRACKET,')',1,1460) -LexToken(OPERATOR,'+',1,1461) +LexToken(ADDITION,'+',1,1461) LexToken(VAR,'MSG3',1,1462) LexToken(SEMICOLON,';',1,1466) LexToken(EOL,'\n',1,1467) LexToken(VAR,'VEC',1,1484) LexToken(ASSIGNMENT,'=',1,1487) LexToken(VAR,'VEC',1,1488) -LexToken(OPERATOR,'+',1,1491) +LexToken(ADDITION,'+',1,1491) LexToken(DQSTRING,'","',1,1494) -LexToken(OPERATOR,'+',1,1495) +LexToken(ADDITION,'+',1,1495) LexToken(DQSTRING,'"\\\'mat\\\',[-1,1]"',1,1511) LexToken(SEMICOLON,';',1,1512) LexToken(EOL,'\n',1,1513) @@ -208,17 +208,17 @@ LexToken(EOL,'\n',1,1587) LexToken(VAR,'GTV',1,1600) LexToken(ASSIGNMENT,'=',1,1603) LexToken(DQSTRING,'"[ok,NMode,Minitial,NX,X0,XP,"',1,1633) -LexToken(OPERATOR,'+',1,1634) +LexToken(ADDITION,'+',1,1634) LexToken(VAR,'CX',1,1635) -LexToken(OPERATOR,'+',1,1637) +LexToken(ADDITION,'+',1,1637) LexToken(DQSTRING,'",exprs]=scicos_getvalue(\\\'Set Finite state machine model\\\', [\\\'Number (finite-state) Modes\\\';\\\'Initial Mode\\\';\\\'Number of continuous-time states\\\';\\\'Continuous-time states intial values\\\';\\\'Xproperties of continuous-time states in each Mode\\\';"',1,1896) -LexToken(OPERATOR,'+',1,1897) +LexToken(ADDITION,'+',1,1897) LexToken(VAR,'MSG',1,1898) -LexToken(OPERATOR,'+',1,1901) +LexToken(ADDITION,'+',1,1901) LexToken(DQSTRING,'"], list(\\\'vec\\\',1,\\\'vec\\\',1,\\\'vec\\\',1,\\\'mat\\\',[-1,-1],\\\'mat\\\',[-1,-1],"',1,1987) -LexToken(OPERATOR,'+',1,1988) +LexToken(ADDITION,'+',1,1988) LexToken(VAR,'VEC',1,1989) -LexToken(OPERATOR,'+',1,1992) +LexToken(ADDITION,'+',1,1992) LexToken(DQSTRING,'"),exprs)"',1,2002) LexToken(EOL,'\n',1,2003) LexToken(VAR,'execstr',1,2016) @@ -245,7 +245,8 @@ LexToken(VAR,'exprs',1,2120) LexToken(COMMA,',',1,2125) LexToken(DQSTRING,'"*"',1,2128) LexToken(CLOSEBRACKET,')',1,2129) -LexToken(NUMBER,'-5',1,2130) +LexToken(ADDITION,'-',1,2130) +LexToken(NUMBER,'5',1,2131) LexToken(SEMICOLON,';',1,2132) LexToken(EOL,'\n',1,2162) LexToken(VAR,'ModifEncore',1,2175) @@ -265,11 +266,11 @@ LexToken(EOL,'\n',1,2229) LexToken(VAR,'exprs',1,2246) LexToken(OPENBRACKET,'(',1,2251) LexToken(VAR,'NMode',1,2252) -LexToken(OPERATOR,'+',1,2257) +LexToken(ADDITION,'+',1,2257) LexToken(NUMBER,'6',1,2258) LexToken(COLON,':',1,2259) LexToken(VAR,'NMode_old',1,2260) -LexToken(OPERATOR,'+',1,2269) +LexToken(ADDITION,'+',1,2269) LexToken(NUMBER,'5',1,2270) LexToken(CLOSEBRACKET,')',1,2271) LexToken(ASSIGNMENT,'=',1,2272) @@ -295,18 +296,18 @@ LexToken(EOL,'\n',1,2381) LexToken(VAR,'exprs',1,2398) LexToken(OPENBRACKET,'(',1,2403) LexToken(VAR,'NMode_old',1,2404) -LexToken(OPERATOR,'+',1,2413) +LexToken(ADDITION,'+',1,2413) LexToken(NUMBER,'6',1,2414) LexToken(COLON,':',1,2415) LexToken(VAR,'NMode',1,2416) -LexToken(OPERATOR,'+',1,2421) +LexToken(ADDITION,'+',1,2421) LexToken(NUMBER,'5',1,2422) LexToken(CLOSEBRACKET,')',1,2423) LexToken(ASSIGNMENT,'=',1,2424) LexToken(VAR,'exprs',1,2425) LexToken(OPENBRACKET,'(',1,2430) LexToken(VAR,'NMode_old',1,2431) -LexToken(OPERATOR,'+',1,2440) +LexToken(ADDITION,'+',1,2440) LexToken(NUMBER,'4',1,2441) LexToken(CLOSEBRACKET,')',1,2442) LexToken(SEMICOLON,';',1,2443) @@ -334,7 +335,7 @@ LexToken(EOL,'\n',1,2550) LexToken(VAR,'messagebox',1,2567) LexToken(OPENBRACKET,'(',1,2577) LexToken(DQSTRING,'"the size of intial continuous-time states should be NX="',1,2634) -LexToken(OPERATOR,'+',1,2635) +LexToken(ADDITION,'+',1,2635) LexToken(VAR,'string',1,2636) LexToken(OPENBRACKET,'(',1,2642) LexToken(VAR,'NX',1,2643) @@ -374,12 +375,12 @@ LexToken(EOL,'\n',1,2772) LexToken(VAR,'messagebox',1,2789) LexToken(OPENBRACKET,'(',1,2799) LexToken(DQSTRING,'"Xproperty matrix is not valid: it should have NX="',1,2850) -LexToken(OPERATOR,'+',1,2851) +LexToken(ADDITION,'+',1,2851) LexToken(VAR,'string',1,2852) LexToken(OPENBRACKET,'(',1,2858) LexToken(VAR,'NX',1,2859) LexToken(CLOSEBRACKET,')',1,2861) -LexToken(OPERATOR,'+',1,2862) +LexToken(ADDITION,'+',1,2862) LexToken(DQSTRING,'" columns"',1,2872) LexToken(COMMA,',',1,2873) LexToken(DQSTRING,'"modal"',1,2880) @@ -411,12 +412,12 @@ LexToken(EOL,'\n',1,2967) LexToken(VAR,'messagebox',1,2984) LexToken(OPENBRACKET,'(',1,2994) LexToken(DQSTRING,'"Xproperty matrix is not valid: it should have NMode="',1,3048) -LexToken(OPERATOR,'+',1,3049) +LexToken(ADDITION,'+',1,3049) LexToken(VAR,'string',1,3050) LexToken(OPENBRACKET,'(',1,3056) LexToken(VAR,'NMode',1,3057) LexToken(CLOSEBRACKET,')',1,3062) -LexToken(OPERATOR,'+',1,3063) +LexToken(ADDITION,'+',1,3063) LexToken(DQSTRING,'" or 1 row(s)"',1,3077) LexToken(COMMA,',',1,3078) LexToken(DQSTRING,'"modal"',1,3085) @@ -443,7 +444,8 @@ LexToken(ASSIGNMENT,'=',1,3178) LexToken(NUMBER,'1',1,3179) LexToken(COLON,':',1,3180) LexToken(VAR,'NMode',1,3181) -LexToken(NUMBER,'-1',1,3186) +LexToken(ADDITION,'-',1,3186) +LexToken(NUMBER,'1',1,3187) LexToken(EOL,'\n',1,3188) LexToken(VAR,'XP',1,3209) LexToken(ASSIGNMENT,'=',1,3211) @@ -485,7 +487,7 @@ LexToken(VAR,'XP',1,3380) LexToken(TRANSPOSE,"'",1,3382) LexToken(COMMA,',',1,3383) LexToken(VAR,'NMode',1,3384) -LexToken(OPERATOR,'*',1,3389) +LexToken(MULTIPLICATION,'*',1,3389) LexToken(VAR,'NX',1,3390) LexToken(COMMA,',',1,3392) LexToken(NUMBER,'1',1,3393) @@ -539,7 +541,7 @@ LexToken(OPENSQBRACKET,'[',1,3645) LexToken(NUMBER,'2',1,3646) LexToken(SEMICOLON,';',1,3647) LexToken(NUMBER,'2',1,3648) -LexToken(OPERATOR,'*',1,3649) +LexToken(MULTIPLICATION,'*',1,3649) LexToken(VAR,'NX',1,3650) LexToken(CLOSESQBRACKET,']',1,3652) LexToken(SEMICOLON,';',1,3653) @@ -579,7 +581,7 @@ LexToken(OPENBRACKET,'(',1,3838) LexToken(VAR,'exprs',1,3839) LexToken(OPENBRACKET,'(',1,3844) LexToken(NUMBER,'5',1,3845) -LexToken(OPERATOR,'+',1,3846) +LexToken(ADDITION,'+',1,3846) LexToken(VAR,'i',1,3847) LexToken(CLOSEBRACKET,')',1,3848) LexToken(CLOSEBRACKET,')',1,3849) @@ -602,9 +604,9 @@ LexToken(NUMBER,'1',1,3933) LexToken(CLOSEBRACKET,')',1,3934) LexToken(ASSIGNMENT,'=',1,3935) LexToken(NUMBER,'2',1,3936) -LexToken(OPERATOR,'*',1,3937) +LexToken(MULTIPLICATION,'*',1,3937) LexToken(VAR,'NX',1,3938) -LexToken(OPERATOR,'+',1,3940) +LexToken(ADDITION,'+',1,3940) LexToken(VAR,'length',1,3941) LexToken(OPENBRACKET,'(',1,3947) LexToken(VAR,'Ci',1,3948) @@ -671,19 +673,19 @@ LexToken(VAR,'messagebox',1,4295) LexToken(OPENBRACKET,'(',1,4305) LexToken(OPENSQBRACKET,'[',1,4306) LexToken(DQSTRING,'"Number of Modes should be "',1,4334) -LexToken(OPERATOR,'+',1,4335) +LexToken(ADDITION,'+',1,4335) LexToken(VAR,'string',1,4336) LexToken(OPENBRACKET,'(',1,4342) LexToken(VAR,'MaxModes',1,4343) LexToken(CLOSEBRACKET,')',1,4351) LexToken(SEMICOLON,';',1,4352) LexToken(DQSTRING,'"A destination Mode in Mode#"',1,4404) -LexToken(OPERATOR,'+',1,4405) +LexToken(ADDITION,'+',1,4405) LexToken(VAR,'string',1,4406) LexToken(OPENBRACKET,'(',1,4412) LexToken(VAR,'imax',1,4413) LexToken(CLOSEBRACKET,')',1,4417) -LexToken(OPERATOR,'+',1,4418) +LexToken(ADDITION,'+',1,4418) LexToken(DQSTRING,'"\\\'s targets is invalid!"',1,4443) LexToken(CLOSESQBRACKET,']',1,4444) LexToken(COMMA,',',1,4445) @@ -710,7 +712,7 @@ LexToken(VAR,'messagebox',1,4579) LexToken(OPENBRACKET,'(',1,4589) LexToken(OPENSQBRACKET,'[',1,4590) LexToken(DQSTRING,'"There is an unused Mode or the Number of Modes should be "',1,4649) -LexToken(OPERATOR,'+',1,4650) +LexToken(ADDITION,'+',1,4650) LexToken(VAR,'string',1,4651) LexToken(OPENBRACKET,'(',1,4657) LexToken(VAR,'MaxModes',1,4658) @@ -787,7 +789,7 @@ LexToken(ASSIGNMENT,'=',1,5009) LexToken(VAR,'ones',1,5010) LexToken(OPENBRACKET,'(',1,5014) LexToken(NUMBER,'2',1,5015) -LexToken(OPERATOR,'*',1,5016) +LexToken(MULTIPLICATION,'*',1,5016) LexToken(VAR,'NX',1,5017) LexToken(COMMA,',',1,5019) LexToken(NUMBER,'1',1,5020) @@ -805,19 +807,19 @@ LexToken(NUMBER,'1',1,5057) LexToken(CLOSEBRACKET,')',1,5058) LexToken(ASSIGNMENT,'=',1,5059) LexToken(DQSTRING,'"txt=[\\\'Automaton\\\';\\\'nM="',1,5085) -LexToken(OPERATOR,'+',1,5086) +LexToken(ADDITION,'+',1,5086) LexToken(VAR,'string',1,5087) LexToken(OPENBRACKET,'(',1,5093) LexToken(VAR,'NMode',1,5094) LexToken(CLOSEBRACKET,')',1,5099) -LexToken(OPERATOR,'+',1,5100) +LexToken(ADDITION,'+',1,5100) LexToken(DQSTRING,'",nX="',1,5106) -LexToken(OPERATOR,'+',1,5107) +LexToken(ADDITION,'+',1,5107) LexToken(VAR,'string',1,5108) LexToken(OPENBRACKET,'(',1,5114) LexToken(VAR,'NX',1,5115) LexToken(CLOSEBRACKET,')',1,5117) -LexToken(OPERATOR,'+',1,5118) +LexToken(ADDITION,'+',1,5118) LexToken(DQSTRING,'"\\\'];"',1,5124) LexToken(EOL,'\n',1,5125) LexToken(VAR,'graphics',1,5142) @@ -998,15 +1000,15 @@ LexToken(VAR,'in',1,5958) LexToken(ASSIGNMENT,'=',1,5960) LexToken(OPENSQBRACKET,'[',1,5961) LexToken(NUMBER,'2',1,5962) -LexToken(OPERATOR,'*',1,5963) +LexToken(MULTIPLICATION,'*',1,5963) LexToken(VAR,'NX',1,5964) -LexToken(OPERATOR,'+',1,5966) +LexToken(ADDITION,'+',1,5966) LexToken(NUMBER,'1',1,5967) LexToken(SEMICOLON,';',1,5968) LexToken(NUMBER,'2',1,5969) -LexToken(OPERATOR,'*',1,5970) +LexToken(MULTIPLICATION,'*',1,5970) LexToken(VAR,'NX',1,5971) -LexToken(OPERATOR,'+',1,5973) +LexToken(ADDITION,'+',1,5973) LexToken(NUMBER,'1',1,5974) LexToken(CLOSESQBRACKET,']',1,5975) LexToken(SEMICOLON,';',1,5976) @@ -1019,7 +1021,7 @@ LexToken(OPENSQBRACKET,'[',1,6013) LexToken(NUMBER,'2',1,6014) LexToken(SEMICOLON,';',1,6015) LexToken(NUMBER,'2',1,6016) -LexToken(OPERATOR,'*',1,6017) +LexToken(MULTIPLICATION,'*',1,6017) LexToken(VAR,'NX',1,6018) LexToken(CLOSESQBRACKET,']',1,6020) LexToken(SEMICOLON,';',1,6021) @@ -1031,7 +1033,7 @@ LexToken(ASSIGNMENT,'=',1,6058) LexToken(VAR,'ones',1,6059) LexToken(OPENBRACKET,'(',1,6063) LexToken(NUMBER,'2',1,6064) -LexToken(OPERATOR,'*',1,6065) +LexToken(MULTIPLICATION,'*',1,6065) LexToken(VAR,'NX',1,6066) LexToken(COMMA,',',1,6068) LexToken(NUMBER,'1',1,6069) @@ -1062,7 +1064,8 @@ LexToken(VAR,'model',1,6192) LexToken(DOT,'.',1,6197) LexToken(VAR,'firing',1,6198) LexToken(ASSIGNMENT,'=',1,6204) -LexToken(NUMBER,'-1',1,6205) +LexToken(ADDITION,'-',1,6205) +LexToken(NUMBER,'1',1,6206) LexToken(SEMICOLON,';',1,6207) LexToken(EOL,'\n',1,6208) LexToken(VAR,'model',1,6217) diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index b360887e..474aabd3 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -174,31 +174,38 @@ LexToken(VAR,'list',1,1412) LexToken(OPENBRACKET,'(',1,1416) LexToken(DQSTRING,'"vec"',1,1421) LexToken(COMMA,',',1,1422) -LexToken(NUMBER,'-1',1,1423) +LexToken(ADDITION,'-',1,1423) +LexToken(NUMBER,'1',1,1424) LexToken(COMMA,',',1,1425) LexToken(DQSTRING,'"vec"',1,1430) LexToken(COMMA,',',1,1431) -LexToken(NUMBER,'-1',1,1432) +LexToken(ADDITION,'-',1,1432) +LexToken(NUMBER,'1',1,1433) LexToken(COMMA,',',1,1434) LexToken(DQSTRING,'"vec"',1,1439) LexToken(COMMA,',',1,1440) -LexToken(NUMBER,'-1',1,1441) +LexToken(ADDITION,'-',1,1441) +LexToken(NUMBER,'1',1,1442) LexToken(COMMA,',',1,1443) LexToken(DQSTRING,'"vec"',1,1448) LexToken(COMMA,',',1,1449) -LexToken(NUMBER,'-1',1,1450) +LexToken(ADDITION,'-',1,1450) +LexToken(NUMBER,'1',1,1451) LexToken(COMMA,',',1,1452) LexToken(DQSTRING,'"vec"',1,1457) LexToken(COMMA,',',1,1458) -LexToken(NUMBER,'-1',1,1459) +LexToken(ADDITION,'-',1,1459) +LexToken(NUMBER,'1',1,1460) LexToken(COMMA,',',1,1461) LexToken(DQSTRING,'"vec"',1,1481) LexToken(COMMA,',',1,1482) -LexToken(NUMBER,'-1',1,1483) +LexToken(ADDITION,'-',1,1483) +LexToken(NUMBER,'1',1,1484) LexToken(COMMA,',',1,1485) LexToken(DQSTRING,'"vec"',1,1490) LexToken(COMMA,',',1,1491) -LexToken(NUMBER,'-1',1,1492) +LexToken(ADDITION,'-',1,1492) +LexToken(NUMBER,'1',1,1493) LexToken(COMMA,',',1,1494) LexToken(DQSTRING,'"vec"',1,1499) LexToken(COMMA,',',1,1500) @@ -488,7 +495,7 @@ LexToken(FOR,'for',1,2539) LexToken(VAR,'j',1,2543) LexToken(ASSIGNMENT,'=',1,2544) LexToken(VAR,'i',1,2545) -LexToken(OPERATOR,'+',1,2546) +LexToken(ADDITION,'+',1,2546) LexToken(NUMBER,'1',1,2547) LexToken(COLON,':',1,2548) LexToken(VAR,'n',1,2549) @@ -503,7 +510,7 @@ LexToken(EOL,'\n',1,2584) LexToken(VAR,'k',1,2609) LexToken(ASSIGNMENT,'=',1,2610) LexToken(VAR,'k',1,2611) -LexToken(OPERATOR,'+',1,2612) +LexToken(ADDITION,'+',1,2612) LexToken(NUMBER,'1',1,2613) LexToken(EOL,'\n',1,2614) LexToken(VAR,'ipar',1,2639) @@ -516,7 +523,7 @@ LexToken(EOL,'\n',1,2648) LexToken(VAR,'k',1,2673) LexToken(ASSIGNMENT,'=',1,2674) LexToken(VAR,'k',1,2675) -LexToken(OPERATOR,'+',1,2676) +LexToken(ADDITION,'+',1,2676) LexToken(NUMBER,'1',1,2677) LexToken(EOL,'\n',1,2678) LexToken(END,'end',1,2699) @@ -580,16 +587,17 @@ LexToken(DOT,'.',1,2932) LexToken(VAR,'nzcross',1,2933) LexToken(ASSIGNMENT,'=',1,2940) LexToken(VAR,'n',1,2941) -LexToken(OPERATOR,'*',1,2942) +LexToken(MULTIPLICATION,'*',1,2942) LexToken(OPENBRACKET,'(',1,2943) LexToken(VAR,'n',1,2944) -LexToken(NUMBER,'-1',1,2945) +LexToken(ADDITION,'-',1,2945) +LexToken(NUMBER,'1',1,2946) LexToken(CLOSEBRACKET,')',1,2947) -LexToken(OPERATOR,'/',1,2948) +LexToken(MULTIPLICATION,'/',1,2948) LexToken(NUMBER,'2',1,2949) -LexToken(OPERATOR,'+',1,2950) +LexToken(ADDITION,'+',1,2950) LexToken(NUMBER,'4',1,2951) -LexToken(OPERATOR,'*',1,2952) +LexToken(MULTIPLICATION,'*',1,2952) LexToken(VAR,'n',1,2953) LexToken(SEMICOLON,';',1,2954) LexToken(EOL,'\n',1,2955) @@ -648,7 +656,7 @@ LexToken(FOR,'for',1,3197) LexToken(VAR,'j',1,3201) LexToken(ASSIGNMENT,'=',1,3202) LexToken(VAR,'i',1,3203) -LexToken(OPERATOR,'+',1,3204) +LexToken(ADDITION,'+',1,3204) LexToken(NUMBER,'1',1,3205) LexToken(COLON,':',1,3206) LexToken(VAR,'n',1,3207) @@ -663,7 +671,7 @@ LexToken(EOL,'\n',1,3234) LexToken(VAR,'k',1,3251) LexToken(ASSIGNMENT,'=',1,3252) LexToken(VAR,'k',1,3253) -LexToken(OPERATOR,'+',1,3254) +LexToken(ADDITION,'+',1,3254) LexToken(NUMBER,'1',1,3255) LexToken(EOL,'\n',1,3256) LexToken(VAR,'ipar',1,3273) @@ -676,7 +684,7 @@ LexToken(EOL,'\n',1,3282) LexToken(VAR,'k',1,3299) LexToken(ASSIGNMENT,'=',1,3300) LexToken(VAR,'k',1,3301) -LexToken(OPERATOR,'+',1,3302) +LexToken(ADDITION,'+',1,3302) LexToken(NUMBER,'1',1,3303) LexToken(EOL,'\n',1,3304) LexToken(END,'end',1,3317) @@ -846,16 +854,17 @@ LexToken(DOT,'.',1,3776) LexToken(VAR,'nzcross',1,3777) LexToken(ASSIGNMENT,'=',1,3784) LexToken(VAR,'n',1,3785) -LexToken(OPERATOR,'*',1,3786) +LexToken(MULTIPLICATION,'*',1,3786) LexToken(OPENBRACKET,'(',1,3787) LexToken(VAR,'n',1,3788) -LexToken(NUMBER,'-1',1,3789) +LexToken(ADDITION,'-',1,3789) +LexToken(NUMBER,'1',1,3790) LexToken(CLOSEBRACKET,')',1,3791) -LexToken(OPERATOR,'/',1,3792) +LexToken(MULTIPLICATION,'/',1,3792) LexToken(NUMBER,'2',1,3793) -LexToken(OPERATOR,'+',1,3794) +LexToken(ADDITION,'+',1,3794) LexToken(NUMBER,'4',1,3795) -LexToken(OPERATOR,'*',1,3796) +LexToken(MULTIPLICATION,'*',1,3796) LexToken(VAR,'n',1,3797) LexToken(SEMICOLON,';',1,3798) LexToken(EOL,'\n',1,3799) diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index d0b4dac1..efd41c19 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -147,11 +147,13 @@ LexToken(VAR,'list',1,1495) LexToken(OPENBRACKET,'(',1,1499) LexToken(DQSTRING,'"vec"',1,1504) LexToken(COMMA,',',1,1505) -LexToken(NUMBER,'-1',1,1506) +LexToken(ADDITION,'-',1,1506) +LexToken(NUMBER,'1',1,1507) LexToken(COMMA,',',1,1508) LexToken(DQSTRING,'"vec"',1,1513) LexToken(COMMA,',',1,1514) -LexToken(NUMBER,'-1',1,1515) +LexToken(ADDITION,'-',1,1515) +LexToken(NUMBER,'1',1,1516) LexToken(COMMA,',',1,1517) LexToken(DQSTRING,'"vec"',1,1522) LexToken(COMMA,',',1,1523) @@ -232,7 +234,8 @@ LexToken(EOL,'\n',1,1862) LexToken(IF,'if',1,1875) LexToken(VAR,'win',1,1878) LexToken(COMPARISON,'<',1,1881) -LexToken(NUMBER,'-1',1,1882) +LexToken(ADDITION,'-',1,1882) +LexToken(NUMBER,'1',1,1883) LexToken(THEN,'then',1,1885) LexToken(EOL,'\n',1,1889) LexToken(VAR,'mess',1,1906) @@ -352,12 +355,13 @@ LexToken(EOL,'\n',1,2485) LexToken(VAR,'z',1,2506) LexToken(OPENBRACKET,'(',1,2507) LexToken(NUMBER,'6',1,2508) -LexToken(OPERATOR,'*',1,2509) +LexToken(MULTIPLICATION,'*',1,2509) LexToken(OPENBRACKET,'(',1,2510) LexToken(VAR,'i',1,2511) -LexToken(NUMBER,'-1',1,2512) +LexToken(ADDITION,'-',1,2512) +LexToken(NUMBER,'1',1,2513) LexToken(CLOSEBRACKET,')',1,2514) -LexToken(OPERATOR,'+',1,2515) +LexToken(ADDITION,'+',1,2515) LexToken(NUMBER,'1',1,2516) LexToken(CLOSEBRACKET,')',1,2517) LexToken(ASSIGNMENT,'=',1,2518) @@ -366,12 +370,13 @@ LexToken(EOL,'\n',1,2520) LexToken(VAR,'z',1,2541) LexToken(OPENBRACKET,'(',1,2542) LexToken(NUMBER,'6',1,2543) -LexToken(OPERATOR,'*',1,2544) +LexToken(MULTIPLICATION,'*',1,2544) LexToken(OPENBRACKET,'(',1,2545) LexToken(VAR,'i',1,2546) -LexToken(NUMBER,'-1',1,2547) +LexToken(ADDITION,'-',1,2547) +LexToken(NUMBER,'1',1,2548) LexToken(CLOSEBRACKET,')',1,2549) -LexToken(OPERATOR,'+',1,2550) +LexToken(ADDITION,'+',1,2550) LexToken(NUMBER,'2',1,2551) LexToken(CLOSEBRACKET,')',1,2552) LexToken(ASSIGNMENT,'=',1,2553) @@ -380,17 +385,18 @@ LexToken(EOL,'\n',1,2555) LexToken(VAR,'z',1,2576) LexToken(OPENBRACKET,'(',1,2577) LexToken(NUMBER,'6',1,2578) -LexToken(OPERATOR,'*',1,2579) +LexToken(MULTIPLICATION,'*',1,2579) LexToken(OPENBRACKET,'(',1,2580) LexToken(VAR,'i',1,2581) -LexToken(NUMBER,'-1',1,2582) +LexToken(ADDITION,'-',1,2582) +LexToken(NUMBER,'1',1,2583) LexToken(CLOSEBRACKET,')',1,2584) -LexToken(OPERATOR,'+',1,2585) +LexToken(ADDITION,'+',1,2585) LexToken(NUMBER,'3',1,2586) LexToken(CLOSEBRACKET,')',1,2587) LexToken(ASSIGNMENT,'=',1,2588) LexToken(NUMBER,'2',1,2589) -LexToken(OPERATOR,'*',1,2590) +LexToken(MULTIPLICATION,'*',1,2590) LexToken(VAR,'siz',1,2591) LexToken(OPENBRACKET,'(',1,2594) LexToken(VAR,'i',1,2595) @@ -399,17 +405,18 @@ LexToken(EOL,'\n',1,2597) LexToken(VAR,'z',1,2618) LexToken(OPENBRACKET,'(',1,2619) LexToken(NUMBER,'6',1,2620) -LexToken(OPERATOR,'*',1,2621) +LexToken(MULTIPLICATION,'*',1,2621) LexToken(OPENBRACKET,'(',1,2622) LexToken(VAR,'i',1,2623) -LexToken(NUMBER,'-1',1,2624) +LexToken(ADDITION,'-',1,2624) +LexToken(NUMBER,'1',1,2625) LexToken(CLOSEBRACKET,')',1,2626) -LexToken(OPERATOR,'+',1,2627) +LexToken(ADDITION,'+',1,2627) LexToken(NUMBER,'4',1,2628) LexToken(CLOSEBRACKET,')',1,2629) LexToken(ASSIGNMENT,'=',1,2630) LexToken(NUMBER,'2',1,2631) -LexToken(OPERATOR,'*',1,2632) +LexToken(MULTIPLICATION,'*',1,2632) LexToken(VAR,'siz',1,2633) LexToken(OPENBRACKET,'(',1,2636) LexToken(VAR,'i',1,2637) @@ -418,12 +425,13 @@ LexToken(EOL,'\n',1,2639) LexToken(VAR,'z',1,2660) LexToken(OPENBRACKET,'(',1,2661) LexToken(NUMBER,'6',1,2662) -LexToken(OPERATOR,'*',1,2663) +LexToken(MULTIPLICATION,'*',1,2663) LexToken(OPENBRACKET,'(',1,2664) LexToken(VAR,'i',1,2665) -LexToken(NUMBER,'-1',1,2666) +LexToken(ADDITION,'-',1,2666) +LexToken(NUMBER,'1',1,2667) LexToken(CLOSEBRACKET,')',1,2668) -LexToken(OPERATOR,'+',1,2669) +LexToken(ADDITION,'+',1,2669) LexToken(NUMBER,'5',1,2670) LexToken(CLOSEBRACKET,')',1,2671) LexToken(ASSIGNMENT,'=',1,2672) @@ -432,17 +440,18 @@ LexToken(EOL,'\n',1,2678) LexToken(VAR,'z',1,2699) LexToken(OPENBRACKET,'(',1,2700) LexToken(NUMBER,'6',1,2701) -LexToken(OPERATOR,'*',1,2702) +LexToken(MULTIPLICATION,'*',1,2702) LexToken(OPENBRACKET,'(',1,2703) LexToken(VAR,'i',1,2704) -LexToken(NUMBER,'-1',1,2705) +LexToken(ADDITION,'-',1,2705) +LexToken(NUMBER,'1',1,2706) LexToken(CLOSEBRACKET,')',1,2707) -LexToken(OPERATOR,'+',1,2708) +LexToken(ADDITION,'+',1,2708) LexToken(NUMBER,'6',1,2709) LexToken(CLOSEBRACKET,')',1,2710) LexToken(ASSIGNMENT,'=',1,2711) LexToken(NUMBER,'64.0',1,2712) -LexToken(OPERATOR,'*',1,2716) +LexToken(MULTIPLICATION,'*',1,2716) LexToken(NUMBER,'360.000',1,2717) LexToken(SEMICOLON,';',1,2724) LexToken(EOL,'\n',1,2725) @@ -498,7 +507,8 @@ LexToken(THEN,'then',1,2982) LexToken(EOL,'\n',1,2986) LexToken(VAR,'win',1,2995) LexToken(ASSIGNMENT,'=',1,2998) -LexToken(NUMBER,'-1',1,2999) +LexToken(ADDITION,'-',1,2999) +LexToken(NUMBER,'1',1,3000) LexToken(SEMICOLON,';',1,3001) LexToken(EOL,'\n',1,3002) LexToken(VAR,'imode',1,3011) @@ -525,7 +535,8 @@ LexToken(CLOSESQBRACKET,']',1,3056) LexToken(EOL,'\n',1,3057) LexToken(VAR,'xmin',1,3066) LexToken(ASSIGNMENT,'=',1,3070) -LexToken(NUMBER,'-5',1,3071) +LexToken(ADDITION,'-',1,3071) +LexToken(NUMBER,'5',1,3072) LexToken(SEMICOLON,';',1,3073) LexToken(EOL,'\n',1,3074) LexToken(VAR,'xmax',1,3083) @@ -565,9 +576,11 @@ LexToken(DOT,'.',1,3203) LexToken(VAR,'in',1,3204) LexToken(ASSIGNMENT,'=',1,3206) LexToken(OPENSQBRACKET,'[',1,3207) -LexToken(NUMBER,'-1',1,3208) +LexToken(ADDITION,'-',1,3208) +LexToken(NUMBER,'1',1,3209) LexToken(SEMICOLON,';',1,3210) -LexToken(NUMBER,'-1',1,3211) +LexToken(ADDITION,'-',1,3211) +LexToken(NUMBER,'1',1,3212) LexToken(CLOSESQBRACKET,']',1,3213) LexToken(EOL,'\n',1,3214) LexToken(VAR,'model',1,3223) @@ -616,12 +629,13 @@ LexToken(EOL,'\n',1,3332) LexToken(VAR,'z',1,3345) LexToken(OPENBRACKET,'(',1,3346) LexToken(NUMBER,'6',1,3347) -LexToken(OPERATOR,'*',1,3348) +LexToken(MULTIPLICATION,'*',1,3348) LexToken(OPENBRACKET,'(',1,3349) LexToken(VAR,'i',1,3350) -LexToken(NUMBER,'-1',1,3351) +LexToken(ADDITION,'-',1,3351) +LexToken(NUMBER,'1',1,3352) LexToken(CLOSEBRACKET,')',1,3353) -LexToken(OPERATOR,'+',1,3354) +LexToken(ADDITION,'+',1,3354) LexToken(NUMBER,'1',1,3355) LexToken(CLOSEBRACKET,')',1,3356) LexToken(ASSIGNMENT,'=',1,3357) @@ -630,12 +644,13 @@ LexToken(EOL,'\n',1,3359) LexToken(VAR,'z',1,3372) LexToken(OPENBRACKET,'(',1,3373) LexToken(NUMBER,'6',1,3374) -LexToken(OPERATOR,'*',1,3375) +LexToken(MULTIPLICATION,'*',1,3375) LexToken(OPENBRACKET,'(',1,3376) LexToken(VAR,'i',1,3377) -LexToken(NUMBER,'-1',1,3378) +LexToken(ADDITION,'-',1,3378) +LexToken(NUMBER,'1',1,3379) LexToken(CLOSEBRACKET,')',1,3380) -LexToken(OPERATOR,'+',1,3381) +LexToken(ADDITION,'+',1,3381) LexToken(NUMBER,'2',1,3382) LexToken(CLOSEBRACKET,')',1,3383) LexToken(ASSIGNMENT,'=',1,3384) @@ -644,17 +659,18 @@ LexToken(EOL,'\n',1,3386) LexToken(VAR,'z',1,3399) LexToken(OPENBRACKET,'(',1,3400) LexToken(NUMBER,'6',1,3401) -LexToken(OPERATOR,'*',1,3402) +LexToken(MULTIPLICATION,'*',1,3402) LexToken(OPENBRACKET,'(',1,3403) LexToken(VAR,'i',1,3404) -LexToken(NUMBER,'-1',1,3405) +LexToken(ADDITION,'-',1,3405) +LexToken(NUMBER,'1',1,3406) LexToken(CLOSEBRACKET,')',1,3407) -LexToken(OPERATOR,'+',1,3408) +LexToken(ADDITION,'+',1,3408) LexToken(NUMBER,'3',1,3409) LexToken(CLOSEBRACKET,')',1,3410) LexToken(ASSIGNMENT,'=',1,3411) LexToken(NUMBER,'2',1,3412) -LexToken(OPERATOR,'*',1,3413) +LexToken(MULTIPLICATION,'*',1,3413) LexToken(VAR,'siz',1,3414) LexToken(OPENBRACKET,'(',1,3417) LexToken(VAR,'i',1,3418) @@ -663,17 +679,18 @@ LexToken(EOL,'\n',1,3420) LexToken(VAR,'z',1,3433) LexToken(OPENBRACKET,'(',1,3434) LexToken(NUMBER,'6',1,3435) -LexToken(OPERATOR,'*',1,3436) +LexToken(MULTIPLICATION,'*',1,3436) LexToken(OPENBRACKET,'(',1,3437) LexToken(VAR,'i',1,3438) -LexToken(NUMBER,'-1',1,3439) +LexToken(ADDITION,'-',1,3439) +LexToken(NUMBER,'1',1,3440) LexToken(CLOSEBRACKET,')',1,3441) -LexToken(OPERATOR,'+',1,3442) +LexToken(ADDITION,'+',1,3442) LexToken(NUMBER,'4',1,3443) LexToken(CLOSEBRACKET,')',1,3444) LexToken(ASSIGNMENT,'=',1,3445) LexToken(NUMBER,'2',1,3446) -LexToken(OPERATOR,'*',1,3447) +LexToken(MULTIPLICATION,'*',1,3447) LexToken(VAR,'siz',1,3448) LexToken(OPENBRACKET,'(',1,3451) LexToken(VAR,'i',1,3452) @@ -682,12 +699,13 @@ LexToken(EOL,'\n',1,3454) LexToken(VAR,'z',1,3467) LexToken(OPENBRACKET,'(',1,3468) LexToken(NUMBER,'6',1,3469) -LexToken(OPERATOR,'*',1,3470) +LexToken(MULTIPLICATION,'*',1,3470) LexToken(OPENBRACKET,'(',1,3471) LexToken(VAR,'i',1,3472) -LexToken(NUMBER,'-1',1,3473) +LexToken(ADDITION,'-',1,3473) +LexToken(NUMBER,'1',1,3474) LexToken(CLOSEBRACKET,')',1,3475) -LexToken(OPERATOR,'+',1,3476) +LexToken(ADDITION,'+',1,3476) LexToken(NUMBER,'5',1,3477) LexToken(CLOSEBRACKET,')',1,3478) LexToken(ASSIGNMENT,'=',1,3479) @@ -696,17 +714,18 @@ LexToken(EOL,'\n',1,3485) LexToken(VAR,'z',1,3498) LexToken(OPENBRACKET,'(',1,3499) LexToken(NUMBER,'6',1,3500) -LexToken(OPERATOR,'*',1,3501) +LexToken(MULTIPLICATION,'*',1,3501) LexToken(OPENBRACKET,'(',1,3502) LexToken(VAR,'i',1,3503) -LexToken(NUMBER,'-1',1,3504) +LexToken(ADDITION,'-',1,3504) +LexToken(NUMBER,'1',1,3505) LexToken(CLOSEBRACKET,')',1,3506) -LexToken(OPERATOR,'+',1,3507) +LexToken(ADDITION,'+',1,3507) LexToken(NUMBER,'6',1,3508) LexToken(CLOSEBRACKET,')',1,3509) LexToken(ASSIGNMENT,'=',1,3510) LexToken(NUMBER,'64.0',1,3511) -LexToken(OPERATOR,'*',1,3515) +LexToken(MULTIPLICATION,'*',1,3515) LexToken(NUMBER,'360.000',1,3516) LexToken(SEMICOLON,';',1,3523) LexToken(EOL,'\n',1,3524) diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 41167018..d48741b2 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -341,7 +341,8 @@ LexToken(SEMICOLON,';',1,2296) LexToken(EOL,'\n',1,2297) LexToken(VAR,'xmin',1,2306) LexToken(ASSIGNMENT,'=',1,2310) -LexToken(NUMBER,'-5',1,2311) +LexToken(ADDITION,'-',1,2311) +LexToken(NUMBER,'5',1,2312) LexToken(SEMICOLON,';',1,2313) LexToken(EOL,'\n',1,2314) LexToken(VAR,'xmax',1,2323) diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index b446ff9e..b3d82a53 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -171,23 +171,28 @@ LexToken(NUMBER,'1',1,1816) LexToken(COMMA,',',1,1817) LexToken(DQSTRING,'"vec"',1,1822) LexToken(COMMA,',',1,1823) -LexToken(NUMBER,'-1',1,1824) +LexToken(ADDITION,'-',1,1824) +LexToken(NUMBER,'1',1,1825) LexToken(COMMA,',',1,1826) LexToken(DQSTRING,'"vec"',1,1831) LexToken(COMMA,',',1,1832) -LexToken(NUMBER,'-1',1,1833) +LexToken(ADDITION,'-',1,1833) +LexToken(NUMBER,'1',1,1834) LexToken(COMMA,',',1,1835) LexToken(DQSTRING,'"vec"',1,1840) LexToken(COMMA,',',1,1841) -LexToken(NUMBER,'-1',1,1842) +LexToken(ADDITION,'-',1,1842) +LexToken(NUMBER,'1',1,1843) LexToken(COMMA,',',1,1844) LexToken(DQSTRING,'"vec"',1,1849) LexToken(COMMA,',',1,1850) -LexToken(NUMBER,'-1',1,1851) +LexToken(ADDITION,'-',1,1851) +LexToken(NUMBER,'1',1,1852) LexToken(COMMA,',',1,1853) LexToken(DQSTRING,'"vec"',1,1873) LexToken(COMMA,',',1,1874) -LexToken(NUMBER,'-1',1,1875) +LexToken(ADDITION,'-',1,1875) +LexToken(NUMBER,'1',1,1876) LexToken(COMMA,',',1,1877) LexToken(DQSTRING,'"vec"',1,1882) LexToken(COMMA,',',1,1883) @@ -195,15 +200,18 @@ LexToken(NUMBER,'1',1,1884) LexToken(COMMA,',',1,1885) LexToken(DQSTRING,'"vec"',1,1890) LexToken(COMMA,',',1,1891) -LexToken(NUMBER,'-1',1,1892) +LexToken(ADDITION,'-',1,1892) +LexToken(NUMBER,'1',1,1893) LexToken(COMMA,',',1,1894) LexToken(DQSTRING,'"vec"',1,1899) LexToken(COMMA,',',1,1900) -LexToken(NUMBER,'-1',1,1901) +LexToken(ADDITION,'-',1,1901) +LexToken(NUMBER,'1',1,1902) LexToken(COMMA,',',1,1903) LexToken(DQSTRING,'"vec"',1,1908) LexToken(COMMA,',',1,1909) -LexToken(NUMBER,'-1',1,1910) +LexToken(ADDITION,'-',1,1910) +LexToken(NUMBER,'1',1,1911) LexToken(COMMA,',',1,1912) LexToken(DQSTRING,'"vec"',1,1917) LexToken(COMMA,',',1,1918) diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 159d5558..f0a980cc 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -195,56 +195,68 @@ LexToken(COMMA,',',1,2051) LexToken(DQSTRING,'"mat"',1,2056) LexToken(COMMA,',',1,2057) LexToken(OPENSQBRACKET,'[',1,2058) -LexToken(NUMBER,'-1',1,2059) +LexToken(ADDITION,'-',1,2059) +LexToken(NUMBER,'1',1,2060) LexToken(NUMBER,'2',1,2062) LexToken(CLOSESQBRACKET,']',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,'"mat"',1,2078) LexToken(COMMA,',',1,2079) LexToken(OPENSQBRACKET,'[',1,2080) -LexToken(NUMBER,'-1',1,2081) +LexToken(ADDITION,'-',1,2081) +LexToken(NUMBER,'1',1,2082) LexToken(NUMBER,'2',1,2084) LexToken(CLOSESQBRACKET,']',1,2085) LexToken(COMMA,',',1,2086) LexToken(DQSTRING,'"vec"',1,2091) LexToken(COMMA,',',1,2092) -LexToken(NUMBER,'-1',1,2093) +LexToken(ADDITION,'-',1,2093) +LexToken(NUMBER,'1',1,2094) LexToken(COMMA,',',1,2095) LexToken(DQSTRING,'"vec"',1,2100) LexToken(COMMA,',',1,2101) -LexToken(NUMBER,'-1',1,2102) +LexToken(ADDITION,'-',1,2102) +LexToken(NUMBER,'1',1,2103) LexToken(COMMA,',',1,2104) LexToken(DQSTRING,'"vec"',1,2109) LexToken(COMMA,',',1,2110) -LexToken(NUMBER,'-1',1,2111) +LexToken(ADDITION,'-',1,2111) +LexToken(NUMBER,'1',1,2112) LexToken(COMMA,',',1,2113) LexToken(DQSTRING,'"vec"',1,2133) LexToken(COMMA,',',1,2134) -LexToken(NUMBER,'-1',1,2135) +LexToken(ADDITION,'-',1,2135) +LexToken(NUMBER,'1',1,2136) LexToken(COMMA,',',1,2137) LexToken(DQSTRING,'"vec"',1,2142) LexToken(COMMA,',',1,2143) -LexToken(NUMBER,'-1',1,2144) +LexToken(ADDITION,'-',1,2144) +LexToken(NUMBER,'1',1,2145) LexToken(COMMA,',',1,2146) LexToken(DQSTRING,'"lis"',1,2151) LexToken(COMMA,',',1,2152) -LexToken(NUMBER,'-1',1,2153) +LexToken(ADDITION,'-',1,2153) +LexToken(NUMBER,'1',1,2154) LexToken(COMMA,',',1,2155) LexToken(DQSTRING,'"vec"',1,2160) LexToken(COMMA,',',1,2161) -LexToken(NUMBER,'-1',1,2162) +LexToken(ADDITION,'-',1,2162) +LexToken(NUMBER,'1',1,2163) LexToken(COMMA,',',1,2164) LexToken(DQSTRING,'"vec"',1,2169) LexToken(COMMA,',',1,2170) -LexToken(NUMBER,'-1',1,2171) +LexToken(ADDITION,'-',1,2171) +LexToken(NUMBER,'1',1,2172) LexToken(COMMA,',',1,2173) LexToken(DQSTRING,'"lis"',1,2178) LexToken(COMMA,',',1,2179) -LexToken(NUMBER,'-1',1,2180) +LexToken(ADDITION,'-',1,2180) +LexToken(NUMBER,'1',1,2181) LexToken(COMMA,',',1,2182) LexToken(DQSTRING,'"vec"',1,2187) LexToken(COMMA,',',1,2188) diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 078b1dc7..4cc1a533 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -124,15 +124,18 @@ LexToken(VAR,'list',1,1342) LexToken(OPENBRACKET,'(',1,1346) LexToken(DQSTRING,'"vec"',1,1351) LexToken(COMMA,',',1,1352) -LexToken(NUMBER,'-1',1,1353) +LexToken(ADDITION,'-',1,1353) +LexToken(NUMBER,'1',1,1354) LexToken(COMMA,',',1,1355) LexToken(DQSTRING,'"vec"',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,'"vec"',1,1369) LexToken(COMMA,',',1,1370) -LexToken(NUMBER,'-1',1,1371) +LexToken(ADDITION,'-',1,1371) +LexToken(NUMBER,'1',1,1372) LexToken(CLOSEBRACKET,')',1,1373) LexToken(COMMA,',',1,1374) LexToken(VAR,'exprs',1,1375) @@ -325,7 +328,8 @@ LexToken(OPENBRACKET,'(',1,2374) LexToken(VAR,'i',1,2375) LexToken(CLOSEBRACKET,')',1,2376) LexToken(ASSIGNMENT,'=',1,2377) -LexToken(NUMBER,'-1',1,2378) +LexToken(ADDITION,'-',1,2378) +LexToken(NUMBER,'1',1,2379) LexToken(SEMICOLON,';',1,2380) LexToken(EOL,'\n',1,2381) LexToken(END,'end',1,2402) diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index aa7f8701..bacff14c 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -109,7 +109,8 @@ LexToken(VAR,'list',1,1202) LexToken(OPENBRACKET,'(',1,1206) LexToken(DQSTRING,'"vec"',1,1211) LexToken(COMMA,',',1,1212) -LexToken(NUMBER,'-1',1,1213) +LexToken(ADDITION,'-',1,1213) +LexToken(NUMBER,'1',1,1214) LexToken(CLOSEBRACKET,')',1,1215) LexToken(COMMA,',',1,1216) LexToken(VAR,'exprs',1,1217) @@ -224,8 +225,9 @@ LexToken(VAR,'model',1,1722) LexToken(DOT,'.',1,1727) LexToken(VAR,'ipar',1,1728) LexToken(ASSIGNMENT,'=',1,1732) -LexToken(NUMBER,'-1',1,1733) -LexToken(OPERATOR,'*',1,1735) +LexToken(ADDITION,'-',1,1733) +LexToken(NUMBER,'1',1,1734) +LexToken(MULTIPLICATION,'*',1,1735) LexToken(VAR,'ones',1,1736) LexToken(OPENBRACKET,'(',1,1740) LexToken(VAR,'N',1,1741) diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index c43ff8d4..33092210 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -235,7 +235,8 @@ LexToken(THEN,'then',1,1895) LexToken(EOL,'\n',1,1899) LexToken(VAR,'minp',1,1908) LexToken(ASSIGNMENT,'=',1,1912) -LexToken(NUMBER,'-.5',1,1913) +LexToken(ADDITION,'-',1,1913) +LexToken(NUMBER,'.5',1,1914) LexToken(SEMICOLON,';',1,1916) LexToken(EOL,'\n',1,1917) LexToken(VAR,'maxp',1,1926) diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 5b613eb8..eee0cd9c 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -155,7 +155,7 @@ LexToken(EOL,'\n',1,1457) LexToken(VAR,'save',1,1478) LexToken(OPENBRACKET,'(',1,1482) LexToken(VAR,'TMPDIR',1,1483) -LexToken(OPERATOR,'+',1,1489) +LexToken(ADDITION,'+',1,1489) LexToken(DQSTRING,'"/debug_scicos"',1,1504) LexToken(COMMA,',',1,1505) LexToken(VAR,'debug_scicos',1,1507) diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 8cc3898a..2f69df4c 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -1,402 +1,402 @@ LexToken(EOL,'\n',1,10) LexToken(EOL,'\n',1,13) LexToken(EOL,'\n',1,73) -LexToken(EOL,'\n',1,142) -LexToken(EOL,'\n',1,145) -LexToken(EOL,'\n',1,217) -LexToken(EOL,'\n',1,289) -LexToken(EOL,'\n',1,358) -LexToken(EOL,'\n',1,397) -LexToken(EOL,'\n',1,400) -LexToken(EOL,'\n',1,467) -LexToken(EOL,'\n',1,533) -LexToken(EOL,'\n',1,598) -LexToken(EOL,'\n',1,646) -LexToken(EOL,'\n',1,649) -LexToken(EOL,'\n',1,718) -LexToken(EOL,'\n',1,781) -LexToken(EOL,'\n',1,863) -LexToken(EOL,'\n',1,866) -LexToken(EOL,'\n',1,897) -LexToken(EOL,'\n',1,900) +LexToken(EOL,'\n',1,143) +LexToken(EOL,'\n',1,146) +LexToken(EOL,'\n',1,218) +LexToken(EOL,'\n',1,290) +LexToken(EOL,'\n',1,359) +LexToken(EOL,'\n',1,398) +LexToken(EOL,'\n',1,401) +LexToken(EOL,'\n',1,468) +LexToken(EOL,'\n',1,534) +LexToken(EOL,'\n',1,599) +LexToken(EOL,'\n',1,647) +LexToken(EOL,'\n',1,650) +LexToken(EOL,'\n',1,719) +LexToken(EOL,'\n',1,782) +LexToken(EOL,'\n',1,864) +LexToken(EOL,'\n',1,867) +LexToken(EOL,'\n',1,898) LexToken(EOL,'\n',1,901) -LexToken(FUNCTION,'function',1,902) -LexToken(OPENSQBRACKET,'[',1,911) -LexToken(VAR,'x',1,912) -LexToken(COMMA,',',1,913) -LexToken(VAR,'y',1,914) -LexToken(COMMA,',',1,915) -LexToken(VAR,'typ',1,916) -LexToken(CLOSESQBRACKET,']',1,919) -LexToken(ASSIGNMENT,'=',1,921) -LexToken(VAR,'DSUPER',1,923) -LexToken(OPENBRACKET,'(',1,929) -LexToken(VAR,'job',1,930) -LexToken(COMMA,',',1,933) -LexToken(VAR,'arg1',1,934) -LexToken(COMMA,',',1,938) -LexToken(VAR,'arg2',1,939) -LexToken(CLOSEBRACKET,')',1,943) -LexToken(EOL,'\n',1,944) -LexToken(VAR,'x',1,949) -LexToken(ASSIGNMENT,'=',1,950) -LexToken(OPENSQBRACKET,'[',1,951) -LexToken(CLOSESQBRACKET,']',1,952) -LexToken(SEMICOLON,';',1,953) -LexToken(EOL,'\n',1,954) -LexToken(VAR,'y',1,959) -LexToken(ASSIGNMENT,'=',1,960) -LexToken(OPENSQBRACKET,'[',1,961) -LexToken(CLOSESQBRACKET,']',1,962) -LexToken(SEMICOLON,';',1,963) -LexToken(EOL,'\n',1,964) -LexToken(VAR,'typ',1,969) -LexToken(ASSIGNMENT,'=',1,972) -LexToken(OPENSQBRACKET,'[',1,973) -LexToken(CLOSESQBRACKET,']',1,974) -LexToken(SEMICOLON,';',1,975) -LexToken(EOL,'\n',1,976) +LexToken(EOL,'\n',1,902) +LexToken(FUNCTION,'function',1,903) +LexToken(OPENSQBRACKET,'[',1,912) +LexToken(VAR,'x',1,913) +LexToken(COMMA,',',1,914) +LexToken(VAR,'y',1,915) +LexToken(COMMA,',',1,916) +LexToken(VAR,'typ',1,917) +LexToken(CLOSESQBRACKET,']',1,920) +LexToken(ASSIGNMENT,'=',1,922) +LexToken(VAR,'DSUPER',1,924) +LexToken(OPENBRACKET,'(',1,930) +LexToken(VAR,'job',1,931) +LexToken(COMMA,',',1,934) +LexToken(VAR,'arg1',1,935) +LexToken(COMMA,',',1,939) +LexToken(VAR,'arg2',1,940) +LexToken(CLOSEBRACKET,')',1,944) +LexToken(EOL,'\n',1,945) +LexToken(VAR,'x',1,950) +LexToken(ASSIGNMENT,'=',1,951) +LexToken(OPENSQBRACKET,'[',1,952) +LexToken(CLOSESQBRACKET,']',1,953) +LexToken(SEMICOLON,';',1,954) +LexToken(EOL,'\n',1,955) +LexToken(VAR,'y',1,960) +LexToken(ASSIGNMENT,'=',1,961) +LexToken(OPENSQBRACKET,'[',1,962) +LexToken(CLOSESQBRACKET,']',1,963) +LexToken(SEMICOLON,';',1,964) +LexToken(EOL,'\n',1,965) +LexToken(VAR,'typ',1,970) +LexToken(ASSIGNMENT,'=',1,973) +LexToken(OPENSQBRACKET,'[',1,974) +LexToken(CLOSESQBRACKET,']',1,975) +LexToken(SEMICOLON,';',1,976) LexToken(EOL,'\n',1,977) -LexToken(SELECT,'select',1,982) -LexToken(VAR,'job',1,989) -LexToken(EOL,'\n',1,992) -LexToken(CASE,'case',1,997) -LexToken(DQSTRING,'"set"',1,1006) -LexToken(THEN,'then',1,1008) -LexToken(EOL,'\n',1,1012) -LexToken(VAR,'y',1,1021) -LexToken(ASSIGNMENT,'=',1,1022) -LexToken(VAR,'needcompile',1,1023) -LexToken(EOL,'\n',1,1070) -LexToken(VAR,'typ',1,1079) -LexToken(ASSIGNMENT,'=',1,1082) -LexToken(VAR,'list',1,1083) -LexToken(OPENBRACKET,'(',1,1087) -LexToken(CLOSEBRACKET,')',1,1088) -LexToken(EOL,'\n',1,1089) -LexToken(VAR,'graphics',1,1098) -LexToken(ASSIGNMENT,'=',1,1106) -LexToken(VAR,'arg1',1,1107) -LexToken(DOT,'.',1,1111) -LexToken(VAR,'graphics',1,1112) -LexToken(SEMICOLON,';',1,1120) -LexToken(EOL,'\n',1,1121) -LexToken(IF,'if',1,1130) -LexToken(OPENBRACKET,'(',1,1133) -LexToken(VAR,'length',1,1134) -LexToken(OPENBRACKET,'(',1,1140) -LexToken(VAR,'graphics',1,1141) -LexToken(DOT,'.',1,1149) -LexToken(VAR,'exprs',1,1150) -LexToken(CLOSEBRACKET,')',1,1155) -LexToken(COMPARISON,'==',1,1157) -LexToken(NUMBER,'0',1,1160) -LexToken(CLOSEBRACKET,')',1,1161) -LexToken(THEN,'then',1,1163) -LexToken(EOL,'\n',1,1167) -LexToken(VAR,'warnBlockByUID',1,1180) -LexToken(OPENBRACKET,'(',1,1194) -LexToken(VAR,'arg1',1,1195) -LexToken(DOT,'.',1,1199) -LexToken(VAR,'model',1,1200) -LexToken(DOT,'.',1,1205) -LexToken(VAR,'label',1,1206) -LexToken(COMMA,',',1,1211) -LexToken(VAR,'gettext',1,1213) -LexToken(OPENBRACKET,'(',1,1220) -LexToken(DQSTRING,'"Invalid masked block."',1,1243) -LexToken(CLOSEBRACKET,')',1,1244) +LexToken(EOL,'\n',1,978) +LexToken(SELECT,'select',1,983) +LexToken(VAR,'job',1,990) +LexToken(EOL,'\n',1,993) +LexToken(CASE,'case',1,998) +LexToken(DQSTRING,'"set"',1,1007) +LexToken(THEN,'then',1,1009) +LexToken(EOL,'\n',1,1013) +LexToken(VAR,'y',1,1022) +LexToken(ASSIGNMENT,'=',1,1023) +LexToken(VAR,'needcompile',1,1024) +LexToken(EOL,'\n',1,1071) +LexToken(VAR,'typ',1,1080) +LexToken(ASSIGNMENT,'=',1,1083) +LexToken(VAR,'list',1,1084) +LexToken(OPENBRACKET,'(',1,1088) +LexToken(CLOSEBRACKET,')',1,1089) +LexToken(EOL,'\n',1,1090) +LexToken(VAR,'graphics',1,1099) +LexToken(ASSIGNMENT,'=',1,1107) +LexToken(VAR,'arg1',1,1108) +LexToken(DOT,'.',1,1112) +LexToken(VAR,'graphics',1,1113) +LexToken(SEMICOLON,';',1,1121) +LexToken(EOL,'\n',1,1122) +LexToken(IF,'if',1,1131) +LexToken(OPENBRACKET,'(',1,1134) +LexToken(VAR,'length',1,1135) +LexToken(OPENBRACKET,'(',1,1141) +LexToken(VAR,'graphics',1,1142) +LexToken(DOT,'.',1,1150) +LexToken(VAR,'exprs',1,1151) +LexToken(CLOSEBRACKET,')',1,1156) +LexToken(COMPARISON,'==',1,1158) +LexToken(NUMBER,'0',1,1161) +LexToken(CLOSEBRACKET,')',1,1162) +LexToken(THEN,'then',1,1164) +LexToken(EOL,'\n',1,1168) +LexToken(VAR,'warnBlockByUID',1,1181) +LexToken(OPENBRACKET,'(',1,1195) +LexToken(VAR,'arg1',1,1196) +LexToken(DOT,'.',1,1200) +LexToken(VAR,'model',1,1201) +LexToken(DOT,'.',1,1206) +LexToken(VAR,'label',1,1207) +LexToken(COMMA,',',1,1212) +LexToken(VAR,'gettext',1,1214) +LexToken(OPENBRACKET,'(',1,1221) +LexToken(DQSTRING,'"Invalid masked block."',1,1244) LexToken(CLOSEBRACKET,')',1,1245) -LexToken(SEMICOLON,';',1,1246) -LexToken(EOL,'\n',1,1247) -LexToken(VAR,'x',1,1260) -LexToken(ASSIGNMENT,'=',1,1261) -LexToken(VAR,'arg1',1,1262) -LexToken(COMMA,',',1,1266) -LexToken(EOL,'\n',1,1267) -LexToken(RETURN,'return',1,1280) -LexToken(SEMICOLON,';',1,1286) -LexToken(EOL,'\n',1,1287) -LexToken(END,'end',1,1296) -LexToken(EOL,'\n',1,1299) +LexToken(CLOSEBRACKET,')',1,1246) +LexToken(SEMICOLON,';',1,1247) +LexToken(EOL,'\n',1,1248) +LexToken(VAR,'x',1,1261) +LexToken(ASSIGNMENT,'=',1,1262) +LexToken(VAR,'arg1',1,1263) +LexToken(COMMA,',',1,1267) +LexToken(EOL,'\n',1,1268) +LexToken(RETURN,'return',1,1281) +LexToken(SEMICOLON,';',1,1287) +LexToken(EOL,'\n',1,1288) +LexToken(END,'end',1,1297) LexToken(EOL,'\n',1,1300) -LexToken(VAR,'exprs',1,1309) -LexToken(ASSIGNMENT,'=',1,1314) -LexToken(VAR,'graphics',1,1315) -LexToken(DOT,'.',1,1323) -LexToken(VAR,'exprs',1,1324) -LexToken(OPENBRACKET,'(',1,1329) -LexToken(NUMBER,'1',1,1330) -LexToken(CLOSEBRACKET,')',1,1331) -LexToken(EOL,'\n',1,1332) -LexToken(VAR,'exprs0',1,1341) -LexToken(ASSIGNMENT,'=',1,1347) -LexToken(VAR,'graphics',1,1348) -LexToken(DOT,'.',1,1356) -LexToken(VAR,'exprs',1,1357) -LexToken(OPENBRACKET,'(',1,1362) -LexToken(NUMBER,'2',1,1363) -LexToken(CLOSEBRACKET,')',1,1364) -LexToken(OPENBRACKET,'(',1,1365) -LexToken(NUMBER,'1',1,1366) -LexToken(CLOSEBRACKET,')',1,1367) -LexToken(EOL,'\n',1,1368) -LexToken(VAR,'btitre',1,1377) -LexToken(ASSIGNMENT,'=',1,1383) -LexToken(VAR,'graphics',1,1384) -LexToken(DOT,'.',1,1392) -LexToken(VAR,'exprs',1,1393) -LexToken(OPENBRACKET,'(',1,1398) -LexToken(NUMBER,'2',1,1399) -LexToken(CLOSEBRACKET,')',1,1400) -LexToken(OPENBRACKET,'(',1,1401) -LexToken(NUMBER,'2',1,1402) -LexToken(CLOSEBRACKET,')',1,1403) -LexToken(OPENBRACKET,'(',1,1404) -LexToken(NUMBER,'1',1,1405) -LexToken(CLOSEBRACKET,')',1,1406) -LexToken(EOL,'\n',1,1407) -LexToken(VAR,'bitems',1,1416) -LexToken(ASSIGNMENT,'=',1,1422) -LexToken(VAR,'graphics',1,1423) -LexToken(DOT,'.',1,1431) -LexToken(VAR,'exprs',1,1432) -LexToken(OPENBRACKET,'(',1,1437) -LexToken(NUMBER,'2',1,1438) -LexToken(CLOSEBRACKET,')',1,1439) -LexToken(OPENBRACKET,'(',1,1440) -LexToken(NUMBER,'2',1,1441) -LexToken(CLOSEBRACKET,')',1,1442) -LexToken(OPENBRACKET,'(',1,1443) -LexToken(NUMBER,'2',1,1444) -LexToken(COLON,':',1,1445) -LexToken(LASTINDEX,'$',1,1446) -LexToken(CLOSEBRACKET,')',1,1447) -LexToken(EOL,'\n',1,1448) -LexToken(IF,'if',1,1457) -LexToken(VAR,'exprs0',1,1460) -LexToken(COMPARISON,'==',1,1466) -LexToken(OPENSQBRACKET,'[',1,1468) -LexToken(CLOSESQBRACKET,']',1,1469) -LexToken(THEN,'then',1,1471) -LexToken(EOL,'\n',1,1475) -LexToken(VAR,'x',1,1488) -LexToken(ASSIGNMENT,'=',1,1489) -LexToken(VAR,'arg1',1,1490) -LexToken(COMMA,',',1,1494) -LexToken(EOL,'\n',1,1495) -LexToken(RETURN,'return',1,1508) -LexToken(COMMA,',',1,1514) -LexToken(EOL,'\n',1,1515) -LexToken(END,'end',1,1524) -LexToken(EOL,'\n',1,1527) +LexToken(EOL,'\n',1,1301) +LexToken(VAR,'exprs',1,1310) +LexToken(ASSIGNMENT,'=',1,1315) +LexToken(VAR,'graphics',1,1316) +LexToken(DOT,'.',1,1324) +LexToken(VAR,'exprs',1,1325) +LexToken(OPENBRACKET,'(',1,1330) +LexToken(NUMBER,'1',1,1331) +LexToken(CLOSEBRACKET,')',1,1332) +LexToken(EOL,'\n',1,1333) +LexToken(VAR,'exprs0',1,1342) +LexToken(ASSIGNMENT,'=',1,1348) +LexToken(VAR,'graphics',1,1349) +LexToken(DOT,'.',1,1357) +LexToken(VAR,'exprs',1,1358) +LexToken(OPENBRACKET,'(',1,1363) +LexToken(NUMBER,'2',1,1364) +LexToken(CLOSEBRACKET,')',1,1365) +LexToken(OPENBRACKET,'(',1,1366) +LexToken(NUMBER,'1',1,1367) +LexToken(CLOSEBRACKET,')',1,1368) +LexToken(EOL,'\n',1,1369) +LexToken(VAR,'btitre',1,1378) +LexToken(ASSIGNMENT,'=',1,1384) +LexToken(VAR,'graphics',1,1385) +LexToken(DOT,'.',1,1393) +LexToken(VAR,'exprs',1,1394) +LexToken(OPENBRACKET,'(',1,1399) +LexToken(NUMBER,'2',1,1400) +LexToken(CLOSEBRACKET,')',1,1401) +LexToken(OPENBRACKET,'(',1,1402) +LexToken(NUMBER,'2',1,1403) +LexToken(CLOSEBRACKET,')',1,1404) +LexToken(OPENBRACKET,'(',1,1405) +LexToken(NUMBER,'1',1,1406) +LexToken(CLOSEBRACKET,')',1,1407) +LexToken(EOL,'\n',1,1408) +LexToken(VAR,'bitems',1,1417) +LexToken(ASSIGNMENT,'=',1,1423) +LexToken(VAR,'graphics',1,1424) +LexToken(DOT,'.',1,1432) +LexToken(VAR,'exprs',1,1433) +LexToken(OPENBRACKET,'(',1,1438) +LexToken(NUMBER,'2',1,1439) +LexToken(CLOSEBRACKET,')',1,1440) +LexToken(OPENBRACKET,'(',1,1441) +LexToken(NUMBER,'2',1,1442) +LexToken(CLOSEBRACKET,')',1,1443) +LexToken(OPENBRACKET,'(',1,1444) +LexToken(NUMBER,'2',1,1445) +LexToken(COLON,':',1,1446) +LexToken(LASTINDEX,'$',1,1447) +LexToken(CLOSEBRACKET,')',1,1448) +LexToken(EOL,'\n',1,1449) +LexToken(IF,'if',1,1458) +LexToken(VAR,'exprs0',1,1461) +LexToken(COMPARISON,'==',1,1467) +LexToken(OPENSQBRACKET,'[',1,1469) +LexToken(CLOSESQBRACKET,']',1,1470) +LexToken(THEN,'then',1,1472) +LexToken(EOL,'\n',1,1476) +LexToken(VAR,'x',1,1489) +LexToken(ASSIGNMENT,'=',1,1490) +LexToken(VAR,'arg1',1,1491) +LexToken(COMMA,',',1,1495) +LexToken(EOL,'\n',1,1496) +LexToken(RETURN,'return',1,1509) +LexToken(COMMA,',',1,1515) +LexToken(EOL,'\n',1,1516) +LexToken(END,'end',1,1525) LexToken(EOL,'\n',1,1528) -LexToken(EOL,'\n',1,1574) -LexToken(VAR,'context',1,1583) -LexToken(ASSIGNMENT,'=',1,1591) -LexToken(OPENSQBRACKET,'[',1,1593) -LexToken(VAR,'arg1',1,1594) -LexToken(DOT,'.',1,1598) -LexToken(VAR,'model',1,1599) -LexToken(DOT,'.',1,1604) -LexToken(VAR,'rpar',1,1605) -LexToken(DOT,'.',1,1609) -LexToken(VAR,'props',1,1610) -LexToken(DOT,'.',1,1615) -LexToken(VAR,'context',1,1616) -LexToken(CLOSESQBRACKET,']',1,1623) -LexToken(SEMICOLON,';',1,1624) -LexToken(EOL,'\n',1,1625) -LexToken(OPENSQBRACKET,'[',1,1634) -LexToken(PREVAR,'%scicos_context',1,1635) -LexToken(COMMA,',',1,1650) -LexToken(VAR,'ierr',1,1651) -LexToken(CLOSESQBRACKET,']',1,1655) -LexToken(ASSIGNMENT,'=',1,1657) -LexToken(VAR,'script2var',1,1659) -LexToken(OPENBRACKET,'(',1,1669) -LexToken(VAR,'context',1,1670) -LexToken(COMMA,',',1,1677) -LexToken(PREVAR,'%scicos_context',1,1678) -LexToken(CLOSEBRACKET,')',1,1693) -LexToken(SEMICOLON,';',1,1694) -LexToken(EOL,'\n',1,1695) +LexToken(EOL,'\n',1,1529) +LexToken(EOL,'\n',1,1575) +LexToken(VAR,'context',1,1584) +LexToken(ASSIGNMENT,'=',1,1592) +LexToken(OPENSQBRACKET,'[',1,1594) +LexToken(VAR,'arg1',1,1595) +LexToken(DOT,'.',1,1599) +LexToken(VAR,'model',1,1600) +LexToken(DOT,'.',1,1605) +LexToken(VAR,'rpar',1,1606) +LexToken(DOT,'.',1,1610) +LexToken(VAR,'props',1,1611) +LexToken(DOT,'.',1,1616) +LexToken(VAR,'context',1,1617) +LexToken(CLOSESQBRACKET,']',1,1624) +LexToken(SEMICOLON,';',1,1625) +LexToken(EOL,'\n',1,1626) +LexToken(OPENSQBRACKET,'[',1,1635) +LexToken(PREVAR,'%scicos_context',1,1636) +LexToken(COMMA,',',1,1651) +LexToken(VAR,'ierr',1,1652) +LexToken(CLOSESQBRACKET,']',1,1656) +LexToken(ASSIGNMENT,'=',1,1658) +LexToken(VAR,'script2var',1,1660) +LexToken(OPENBRACKET,'(',1,1670) +LexToken(VAR,'context',1,1671) +LexToken(COMMA,',',1,1678) +LexToken(PREVAR,'%scicos_context',1,1679) +LexToken(CLOSEBRACKET,')',1,1694) +LexToken(SEMICOLON,';',1,1695) LexToken(EOL,'\n',1,1696) -LexToken(IF,'if',1,1705) -LexToken(VAR,'ierr',1,1708) -LexToken(COMPARISON,'<>',1,1713) -LexToken(NUMBER,'0',1,1716) -LexToken(THEN,'then',1,1718) -LexToken(EOL,'\n',1,1722) -LexToken(VAR,'x',1,1735) -LexToken(ASSIGNMENT,'=',1,1736) -LexToken(VAR,'arg1',1,1737) -LexToken(COMMA,',',1,1741) -LexToken(EOL,'\n',1,1742) -LexToken(RETURN,'return',1,1755) -LexToken(SEMICOLON,';',1,1761) -LexToken(EOL,'\n',1,1762) -LexToken(END,'end',1,1771) -LexToken(EOL,'\n',1,1774) +LexToken(EOL,'\n',1,1697) +LexToken(IF,'if',1,1706) +LexToken(VAR,'ierr',1,1709) +LexToken(COMPARISON,'<>',1,1714) +LexToken(NUMBER,'0',1,1717) +LexToken(THEN,'then',1,1719) +LexToken(EOL,'\n',1,1723) +LexToken(VAR,'x',1,1736) +LexToken(ASSIGNMENT,'=',1,1737) +LexToken(VAR,'arg1',1,1738) +LexToken(COMMA,',',1,1742) +LexToken(EOL,'\n',1,1743) +LexToken(RETURN,'return',1,1756) +LexToken(SEMICOLON,';',1,1762) +LexToken(EOL,'\n',1,1763) +LexToken(END,'end',1,1772) LexToken(EOL,'\n',1,1775) -LexToken(EOL,'\n',1,1835) -LexToken(VAR,'tt',1,1844) -LexToken(ASSIGNMENT,'=',1,1846) -LexToken(DQSTRING,'"scicos_context."',1,1863) -LexToken(OPERATOR,'+',1,1864) -LexToken(VAR,'exprs0',1,1865) -LexToken(OPENBRACKET,'(',1,1871) -LexToken(NUMBER,'1',1,1872) -LexToken(CLOSEBRACKET,')',1,1873) -LexToken(SEMICOLON,';',1,1874) -LexToken(EOL,'\n',1,1875) -LexToken(FOR,'for',1,1884) -LexToken(VAR,'i',1,1888) -LexToken(ASSIGNMENT,'=',1,1889) -LexToken(NUMBER,'2',1,1890) -LexToken(COLON,':',1,1891) -LexToken(VAR,'size',1,1892) -LexToken(OPENBRACKET,'(',1,1896) -LexToken(VAR,'exprs0',1,1897) -LexToken(COMMA,',',1,1903) -LexToken(NUMBER,'1',1,1904) -LexToken(CLOSEBRACKET,')',1,1905) -LexToken(EOL,'\n',1,1906) -LexToken(VAR,'tt',1,1919) -LexToken(ASSIGNMENT,'=',1,1921) -LexToken(VAR,'tt',1,1922) -LexToken(OPERATOR,'+',1,1924) -LexToken(DQSTRING,'",scicos_context."',1,1942) -LexToken(OPERATOR,'+',1,1943) -LexToken(VAR,'exprs0',1,1944) -LexToken(OPENBRACKET,'(',1,1950) -LexToken(VAR,'i',1,1951) -LexToken(CLOSEBRACKET,')',1,1952) -LexToken(COMMA,',',1,1953) -LexToken(EOL,'\n',1,1954) -LexToken(END,'end',1,1963) -LexToken(EOL,'\n',1,1966) +LexToken(EOL,'\n',1,1776) +LexToken(EOL,'\n',1,1836) +LexToken(VAR,'tt',1,1845) +LexToken(ASSIGNMENT,'=',1,1847) +LexToken(DQSTRING,'"scicos_context."',1,1864) +LexToken(ADDITION,'+',1,1865) +LexToken(VAR,'exprs0',1,1866) +LexToken(OPENBRACKET,'(',1,1872) +LexToken(NUMBER,'1',1,1873) +LexToken(CLOSEBRACKET,')',1,1874) +LexToken(SEMICOLON,';',1,1875) +LexToken(EOL,'\n',1,1876) +LexToken(FOR,'for',1,1885) +LexToken(VAR,'i',1,1889) +LexToken(ASSIGNMENT,'=',1,1890) +LexToken(NUMBER,'2',1,1891) +LexToken(COLON,':',1,1892) +LexToken(VAR,'size',1,1893) +LexToken(OPENBRACKET,'(',1,1897) +LexToken(VAR,'exprs0',1,1898) +LexToken(COMMA,',',1,1904) +LexToken(NUMBER,'1',1,1905) +LexToken(CLOSEBRACKET,')',1,1906) +LexToken(EOL,'\n',1,1907) +LexToken(VAR,'tt',1,1920) +LexToken(ASSIGNMENT,'=',1,1922) +LexToken(VAR,'tt',1,1923) +LexToken(ADDITION,'+',1,1925) +LexToken(DQSTRING,'",scicos_context."',1,1943) +LexToken(ADDITION,'+',1,1944) +LexToken(VAR,'exprs0',1,1945) +LexToken(OPENBRACKET,'(',1,1951) +LexToken(VAR,'i',1,1952) +LexToken(CLOSEBRACKET,')',1,1953) +LexToken(COMMA,',',1,1954) +LexToken(EOL,'\n',1,1955) +LexToken(END,'end',1,1964) LexToken(EOL,'\n',1,1967) -LexToken(VAR,'ss',1,1976) -LexToken(ASSIGNMENT,'=',1,1978) -LexToken(VAR,'graphics',1,1979) -LexToken(DOT,'.',1,1987) -LexToken(VAR,'exprs',1,1988) -LexToken(OPENBRACKET,'(',1,1993) -LexToken(NUMBER,'2',1,1994) -LexToken(CLOSEBRACKET,')',1,1995) -LexToken(OPENBRACKET,'(',1,1996) -LexToken(NUMBER,'3',1,1997) -LexToken(CLOSEBRACKET,')',1,1998) -LexToken(SEMICOLON,';',1,1999) -LexToken(EOL,'\n',1,2000) -LexToken(SCICOS_CONTEXT,'scicos_context',1,2009) -LexToken(ASSIGNMENT,'=',1,2024) -LexToken(PREVAR,'%scicos_context',1,2026) -LexToken(SEMICOLON,';',1,2041) -LexToken(EOL,'\n',1,2042) -LexToken(VAR,'execstr',1,2051) -LexToken(OPENBRACKET,'(',1,2058) -LexToken(DQSTRING,'"[ok,"',1,2064) -LexToken(OPERATOR,'+',1,2065) -LexToken(VAR,'tt',1,2066) -LexToken(OPERATOR,'+',1,2068) -LexToken(DQSTRING,'",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"',1,2117) -LexToken(CLOSEBRACKET,')',1,2118) -LexToken(EOL,'\n',1,2119) -LexToken(IF,'if',1,2128) -LexToken(VAR,'ok',1,2131) -LexToken(THEN,'then',1,2134) -LexToken(EOL,'\n',1,2138) -LexToken(VAR,'x',1,2151) -LexToken(ASSIGNMENT,'=',1,2152) -LexToken(VAR,'arg1',1,2153) -LexToken(SEMICOLON,';',1,2157) -LexToken(EOL,'\n',1,2158) -LexToken(PREVAR,'%scicos_context',1,2171) -LexToken(ASSIGNMENT,'=',1,2187) -LexToken(SCICOS_CONTEXT,'scicos_context',1,2189) -LexToken(SEMICOLON,';',1,2203) -LexToken(EOL,'\n',1,2204) -LexToken(VAR,'sblock',1,2217) -LexToken(ASSIGNMENT,'=',1,2223) -LexToken(VAR,'x',1,2224) -LexToken(DOT,'.',1,2225) -LexToken(VAR,'model',1,2226) -LexToken(DOT,'.',1,2231) -LexToken(VAR,'rpar',1,2232) -LexToken(SEMICOLON,';',1,2236) -LexToken(EOL,'\n',1,2237) -LexToken(OPENSQBRACKET,'[',1,2250) -LexToken(VAR,'sblock',1,2251) -LexToken(COMMA,',',1,2257) -LexToken(PREVAR,'%w',1,2258) -LexToken(COMMA,',',1,2260) -LexToken(VAR,'needcompile2',1,2261) -LexToken(COMMA,',',1,2273) -LexToken(VAR,'ok',1,2274) -LexToken(CLOSESQBRACKET,']',1,2276) -LexToken(ASSIGNMENT,'=',1,2277) -LexToken(VAR,'do_eval',1,2278) -LexToken(OPENBRACKET,'(',1,2285) -LexToken(VAR,'sblock',1,2286) -LexToken(COMMA,',',1,2292) -LexToken(VAR,'list',1,2293) -LexToken(OPENBRACKET,'(',1,2297) -LexToken(CLOSEBRACKET,')',1,2298) -LexToken(COMMA,',',1,2299) -LexToken(SCICOS_CONTEXT,'scicos_context',1,2300) -LexToken(CLOSEBRACKET,')',1,2314) -LexToken(SEMICOLON,';',1,2315) -LexToken(EOL,'\n',1,2316) -LexToken(VAR,'y',1,2329) -LexToken(ASSIGNMENT,'=',1,2330) -LexToken(VAR,'max',1,2331) -LexToken(OPENBRACKET,'(',1,2334) -LexToken(NUMBER,'2',1,2335) -LexToken(COMMA,',',1,2336) -LexToken(VAR,'needcompile',1,2337) -LexToken(COMMA,',',1,2348) -LexToken(VAR,'needcompile2',1,2349) -LexToken(CLOSEBRACKET,')',1,2361) -LexToken(EOL,'\n',1,2362) -LexToken(VAR,'x',1,2375) -LexToken(DOT,'.',1,2376) -LexToken(VAR,'graphics',1,2377) -LexToken(DOT,'.',1,2385) -LexToken(VAR,'exprs',1,2386) -LexToken(OPENBRACKET,'(',1,2391) -LexToken(NUMBER,'1',1,2392) -LexToken(CLOSEBRACKET,')',1,2393) -LexToken(ASSIGNMENT,'=',1,2394) -LexToken(VAR,'exprs',1,2395) -LexToken(SEMICOLON,';',1,2400) -LexToken(EOL,'\n',1,2401) -LexToken(VAR,'x',1,2414) -LexToken(DOT,'.',1,2415) -LexToken(VAR,'model',1,2416) -LexToken(DOT,'.',1,2421) -LexToken(VAR,'rpar',1,2422) -LexToken(ASSIGNMENT,'=',1,2426) -LexToken(VAR,'sblock',1,2427) -LexToken(SEMICOLON,';',1,2433) -LexToken(EOL,'\n',1,2434) -LexToken(ELSE,'else',1,2443) -LexToken(EOL,'\n',1,2447) -LexToken(VAR,'x',1,2460) -LexToken(ASSIGNMENT,'=',1,2462) -LexToken(VAR,'arg1',1,2464) -LexToken(SEMICOLON,';',1,2468) -LexToken(EOL,'\n',1,2469) -LexToken(END,'end',1,2478) -LexToken(EOL,'\n',1,2481) +LexToken(EOL,'\n',1,1968) +LexToken(VAR,'ss',1,1977) +LexToken(ASSIGNMENT,'=',1,1979) +LexToken(VAR,'graphics',1,1980) +LexToken(DOT,'.',1,1988) +LexToken(VAR,'exprs',1,1989) +LexToken(OPENBRACKET,'(',1,1994) +LexToken(NUMBER,'2',1,1995) +LexToken(CLOSEBRACKET,')',1,1996) +LexToken(OPENBRACKET,'(',1,1997) +LexToken(NUMBER,'3',1,1998) +LexToken(CLOSEBRACKET,')',1,1999) +LexToken(SEMICOLON,';',1,2000) +LexToken(EOL,'\n',1,2001) +LexToken(SCICOS_CONTEXT,'scicos_context',1,2010) +LexToken(ASSIGNMENT,'=',1,2025) +LexToken(PREVAR,'%scicos_context',1,2027) +LexToken(SEMICOLON,';',1,2042) +LexToken(EOL,'\n',1,2043) +LexToken(VAR,'execstr',1,2052) +LexToken(OPENBRACKET,'(',1,2059) +LexToken(DQSTRING,'"[ok,"',1,2065) +LexToken(ADDITION,'+',1,2066) +LexToken(VAR,'tt',1,2067) +LexToken(ADDITION,'+',1,2069) +LexToken(DQSTRING,'",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"',1,2118) +LexToken(CLOSEBRACKET,')',1,2119) +LexToken(EOL,'\n',1,2120) +LexToken(IF,'if',1,2129) +LexToken(VAR,'ok',1,2132) +LexToken(THEN,'then',1,2135) +LexToken(EOL,'\n',1,2139) +LexToken(VAR,'x',1,2152) +LexToken(ASSIGNMENT,'=',1,2153) +LexToken(VAR,'arg1',1,2154) +LexToken(SEMICOLON,';',1,2158) +LexToken(EOL,'\n',1,2159) +LexToken(PREVAR,'%scicos_context',1,2172) +LexToken(ASSIGNMENT,'=',1,2188) +LexToken(SCICOS_CONTEXT,'scicos_context',1,2190) +LexToken(SEMICOLON,';',1,2204) +LexToken(EOL,'\n',1,2205) +LexToken(VAR,'sblock',1,2218) +LexToken(ASSIGNMENT,'=',1,2224) +LexToken(VAR,'x',1,2225) +LexToken(DOT,'.',1,2226) +LexToken(VAR,'model',1,2227) +LexToken(DOT,'.',1,2232) +LexToken(VAR,'rpar',1,2233) +LexToken(SEMICOLON,';',1,2237) +LexToken(EOL,'\n',1,2238) +LexToken(OPENSQBRACKET,'[',1,2251) +LexToken(VAR,'sblock',1,2252) +LexToken(COMMA,',',1,2258) +LexToken(PREVAR,'%w',1,2259) +LexToken(COMMA,',',1,2261) +LexToken(VAR,'needcompile2',1,2262) +LexToken(COMMA,',',1,2274) +LexToken(VAR,'ok',1,2275) +LexToken(CLOSESQBRACKET,']',1,2277) +LexToken(ASSIGNMENT,'=',1,2278) +LexToken(VAR,'do_eval',1,2279) +LexToken(OPENBRACKET,'(',1,2286) +LexToken(VAR,'sblock',1,2287) +LexToken(COMMA,',',1,2293) +LexToken(VAR,'list',1,2294) +LexToken(OPENBRACKET,'(',1,2298) +LexToken(CLOSEBRACKET,')',1,2299) +LexToken(COMMA,',',1,2300) +LexToken(SCICOS_CONTEXT,'scicos_context',1,2301) +LexToken(CLOSEBRACKET,')',1,2315) +LexToken(SEMICOLON,';',1,2316) +LexToken(EOL,'\n',1,2317) +LexToken(VAR,'y',1,2330) +LexToken(ASSIGNMENT,'=',1,2331) +LexToken(VAR,'max',1,2332) +LexToken(OPENBRACKET,'(',1,2335) +LexToken(NUMBER,'2',1,2336) +LexToken(COMMA,',',1,2337) +LexToken(VAR,'needcompile',1,2338) +LexToken(COMMA,',',1,2349) +LexToken(VAR,'needcompile2',1,2350) +LexToken(CLOSEBRACKET,')',1,2362) +LexToken(EOL,'\n',1,2363) +LexToken(VAR,'x',1,2376) +LexToken(DOT,'.',1,2377) +LexToken(VAR,'graphics',1,2378) +LexToken(DOT,'.',1,2386) +LexToken(VAR,'exprs',1,2387) +LexToken(OPENBRACKET,'(',1,2392) +LexToken(NUMBER,'1',1,2393) +LexToken(CLOSEBRACKET,')',1,2394) +LexToken(ASSIGNMENT,'=',1,2395) +LexToken(VAR,'exprs',1,2396) +LexToken(SEMICOLON,';',1,2401) +LexToken(EOL,'\n',1,2402) +LexToken(VAR,'x',1,2415) +LexToken(DOT,'.',1,2416) +LexToken(VAR,'model',1,2417) +LexToken(DOT,'.',1,2422) +LexToken(VAR,'rpar',1,2423) +LexToken(ASSIGNMENT,'=',1,2427) +LexToken(VAR,'sblock',1,2428) +LexToken(SEMICOLON,';',1,2434) +LexToken(EOL,'\n',1,2435) +LexToken(ELSE,'else',1,2444) +LexToken(EOL,'\n',1,2448) +LexToken(VAR,'x',1,2461) +LexToken(ASSIGNMENT,'=',1,2463) +LexToken(VAR,'arg1',1,2465) +LexToken(SEMICOLON,';',1,2469) +LexToken(EOL,'\n',1,2470) +LexToken(END,'end',1,2479) LexToken(EOL,'\n',1,2482) -LexToken(CASE,'case',1,2487) -LexToken(DQSTRING,'"define"',1,2499) -LexToken(THEN,'then',1,2501) -LexToken(EOL,'\n',1,2505) -LexToken(EOL,'\n',1,2527) -LexToken(END,'end',1,2532) -LexToken(EOL,'\n',1,2535) -LexToken(ENDFUNCTION,'endfunction',1,2536) -LexToken(EOL,'\n',1,2547) +LexToken(EOL,'\n',1,2483) +LexToken(CASE,'case',1,2488) +LexToken(DQSTRING,'"define"',1,2500) +LexToken(THEN,'then',1,2502) +LexToken(EOL,'\n',1,2506) +LexToken(EOL,'\n',1,2528) +LexToken(END,'end',1,2533) +LexToken(EOL,'\n',1,2536) +LexToken(ENDFUNCTION,'endfunction',1,2537) +LexToken(EOL,'\n',1,2548) diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 14fea3fa..c05e307a 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -167,7 +167,7 @@ LexToken(EOL,'\n',1,1377) LexToken(VAR,'spath',1,1394) LexToken(OPENBRACKET,'(',1,1399) LexToken(LASTINDEX,'$',1,1400) -LexToken(OPERATOR,'+',1,1401) +LexToken(ADDITION,'+',1,1401) LexToken(NUMBER,'1',1,1402) LexToken(CLOSEBRACKET,')',1,1403) LexToken(ASSIGNMENT,'=',1,1404) @@ -176,7 +176,7 @@ LexToken(EOL,'\n',1,1412) LexToken(VAR,'spath',1,1429) LexToken(OPENBRACKET,'(',1,1434) LexToken(LASTINDEX,'$',1,1435) -LexToken(OPERATOR,'+',1,1436) +LexToken(ADDITION,'+',1,1436) LexToken(NUMBER,'1',1,1437) LexToken(CLOSEBRACKET,')',1,1438) LexToken(ASSIGNMENT,'=',1,1439) @@ -185,7 +185,7 @@ LexToken(EOL,'\n',1,1446) LexToken(VAR,'spath',1,1463) LexToken(OPENBRACKET,'(',1,1468) LexToken(LASTINDEX,'$',1,1469) -LexToken(OPERATOR,'+',1,1470) +LexToken(ADDITION,'+',1,1470) LexToken(NUMBER,'1',1,1471) LexToken(CLOSEBRACKET,')',1,1472) LexToken(ASSIGNMENT,'=',1,1473) @@ -194,7 +194,7 @@ LexToken(EOL,'\n',1,1480) LexToken(VAR,'spath',1,1497) LexToken(OPENBRACKET,'(',1,1502) LexToken(LASTINDEX,'$',1,1503) -LexToken(OPERATOR,'+',1,1504) +LexToken(ADDITION,'+',1,1504) LexToken(NUMBER,'1',1,1505) LexToken(CLOSEBRACKET,')',1,1506) LexToken(ASSIGNMENT,'=',1,1507) @@ -215,11 +215,11 @@ LexToken(EOL,'\n',1,1574) LexToken(VAR,'execstr',1,1587) LexToken(OPENBRACKET,'(',1,1594) LexToken(DQSTRING,'"xxn="',1,1600) -LexToken(OPERATOR,'+',1,1601) +LexToken(ADDITION,'+',1,1601) LexToken(VAR,'xx',1,1602) LexToken(DOT,'.',1,1604) LexToken(VAR,'gui',1,1605) -LexToken(OPERATOR,'+',1,1608) +LexToken(ADDITION,'+',1,1608) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1622) LexToken(CLOSEBRACKET,')',1,1623) LexToken(EOL,'\n',1,1624) @@ -644,7 +644,7 @@ LexToken(VAR,'size',1,3912) LexToken(OPENBRACKET,'(',1,3916) LexToken(VAR,'newpar',1,3917) LexToken(CLOSEBRACKET,')',1,3923) -LexToken(OPERATOR,'+',1,3924) +LexToken(ADDITION,'+',1,3924) LexToken(NUMBER,'1',1,3925) LexToken(CLOSEBRACKET,')',1,3926) LexToken(ASSIGNMENT,'=',1,3927) @@ -1127,7 +1127,8 @@ LexToken(VAR,'orig',1,5721) LexToken(ASSIGNMENT,'=',1,5726) LexToken(OPENSQBRACKET,'[',1,5728) LexToken(NUMBER,'170',1,5729) -LexToken(NUMBER,'-60',1,5733) +LexToken(ADDITION,'-',1,5733) +LexToken(NUMBER,'60',1,5734) LexToken(CLOSESQBRACKET,']',1,5736) LexToken(SEMICOLON,';',1,5737) LexToken(EOL,'\n',1,5738) @@ -1302,7 +1303,8 @@ LexToken(VAR,'ct',1,6329) LexToken(ASSIGNMENT,'=',1,6332) LexToken(OPENSQBRACKET,'[',1,6334) LexToken(NUMBER,'5',1,6335) -LexToken(NUMBER,'-1',1,6337) +LexToken(ADDITION,'-',1,6337) +LexToken(NUMBER,'1',1,6338) LexToken(CLOSESQBRACKET,']',1,6339) LexToken(SEMICOLON,';',1,6340) LexToken(EOL,'\n',1,6341) diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 954d950c..273ba0de 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -167,7 +167,7 @@ LexToken(EOL,'\n',1,1365) LexToken(VAR,'spath',1,1382) LexToken(OPENBRACKET,'(',1,1387) LexToken(LASTINDEX,'$',1,1388) -LexToken(OPERATOR,'+',1,1389) +LexToken(ADDITION,'+',1,1389) LexToken(NUMBER,'1',1,1390) LexToken(CLOSEBRACKET,')',1,1391) LexToken(ASSIGNMENT,'=',1,1392) @@ -176,7 +176,7 @@ LexToken(EOL,'\n',1,1400) LexToken(VAR,'spath',1,1417) LexToken(OPENBRACKET,'(',1,1422) LexToken(LASTINDEX,'$',1,1423) -LexToken(OPERATOR,'+',1,1424) +LexToken(ADDITION,'+',1,1424) LexToken(NUMBER,'1',1,1425) LexToken(CLOSEBRACKET,')',1,1426) LexToken(ASSIGNMENT,'=',1,1427) @@ -185,7 +185,7 @@ LexToken(EOL,'\n',1,1434) LexToken(VAR,'spath',1,1451) LexToken(OPENBRACKET,'(',1,1456) LexToken(LASTINDEX,'$',1,1457) -LexToken(OPERATOR,'+',1,1458) +LexToken(ADDITION,'+',1,1458) LexToken(NUMBER,'1',1,1459) LexToken(CLOSEBRACKET,')',1,1460) LexToken(ASSIGNMENT,'=',1,1461) @@ -194,7 +194,7 @@ LexToken(EOL,'\n',1,1468) LexToken(VAR,'spath',1,1485) LexToken(OPENBRACKET,'(',1,1490) LexToken(LASTINDEX,'$',1,1491) -LexToken(OPERATOR,'+',1,1492) +LexToken(ADDITION,'+',1,1492) LexToken(NUMBER,'1',1,1493) LexToken(CLOSEBRACKET,')',1,1494) LexToken(ASSIGNMENT,'=',1,1495) @@ -215,11 +215,11 @@ LexToken(EOL,'\n',1,1562) LexToken(VAR,'execstr',1,1575) LexToken(OPENBRACKET,'(',1,1582) LexToken(DQSTRING,'"xxn="',1,1588) -LexToken(OPERATOR,'+',1,1589) +LexToken(ADDITION,'+',1,1589) LexToken(VAR,'xx',1,1590) LexToken(DOT,'.',1,1592) LexToken(VAR,'gui',1,1593) -LexToken(OPERATOR,'+',1,1596) +LexToken(ADDITION,'+',1,1596) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1610) LexToken(CLOSEBRACKET,')',1,1611) LexToken(EOL,'\n',1,1612) @@ -733,7 +733,7 @@ LexToken(VAR,'size',1,4274) LexToken(OPENBRACKET,'(',1,4278) LexToken(VAR,'newpar',1,4279) LexToken(CLOSEBRACKET,')',1,4285) -LexToken(OPERATOR,'+',1,4286) +LexToken(ADDITION,'+',1,4286) LexToken(NUMBER,'1',1,4287) LexToken(CLOSEBRACKET,')',1,4288) LexToken(ASSIGNMENT,'=',1,4289) @@ -779,11 +779,13 @@ LexToken(OPENBRACKET,'(',1,4531) LexToken(VAR,'wpar',1,4543) LexToken(ASSIGNMENT,'=',1,4547) LexToken(OPENSQBRACKET,'[',1,4548) -LexToken(NUMBER,'-159.096',1,4549) +LexToken(ADDITION,'-',1,4549) +LexToken(NUMBER,'159.096',1,4550) LexToken(COMMA,',',1,4557) LexToken(NUMBER,'811.104',1,4558) LexToken(COMMA,',',1,4565) -LexToken(NUMBER,'-121.216',1,4566) +LexToken(ADDITION,'-',1,4566) +LexToken(NUMBER,'121.216',1,4567) LexToken(COMMA,',',1,4574) LexToken(NUMBER,'617.984',1,4575) LexToken(COMMA,',',1,4582) @@ -1182,7 +1184,8 @@ LexToken(ASSIGNMENT,'=',1,6124) LexToken(OPENSQBRACKET,'[',1,6125) LexToken(NUMBER,'5',1,6126) LexToken(COMMA,',',1,6127) -LexToken(NUMBER,'-1',1,6128) +LexToken(ADDITION,'-',1,6128) +LexToken(NUMBER,'1',1,6129) LexToken(CLOSESQBRACKET,']',1,6130) LexToken(COMMA,',',1,6131) LexToken(VAR,'from',1,6143) diff --git a/js/Misc/EXPRESSION.js b/js/Misc/EXPRESSION.js index 74a63417..f1d46c1a 100644 --- a/js/Misc/EXPRESSION.js +++ b/js/Misc/EXPRESSION.js @@ -102,12 +102,12 @@ LexToken(EOL,'\n',1,1107) LexToken(VAR,'execstr',1,1120) LexToken(OPENBRACKET,'(',1,1127) LexToken(DQSTRING,'"%scicos_context.u"',1,1146) -LexToken(OPERATOR,'+',1,1147) +LexToken(ADDITION,'+',1,1147) LexToken(VAR,'string',1,1148) LexToken(OPENBRACKET,'(',1,1154) LexToken(VAR,'ii',1,1155) LexToken(CLOSEBRACKET,')',1,1157) -LexToken(OPERATOR,'+',1,1158) +LexToken(ADDITION,'+',1,1158) LexToken(DQSTRING,'"=0"',1,1162) LexToken(CLOSEBRACKET,')',1,1163) LexToken(COMMA,',',1,1164) @@ -252,20 +252,21 @@ LexToken(ASSIGNMENT,'=',1,2098) LexToken(NUMBER,'1',1,2099) LexToken(COLON,':',1,2100) LexToken(PREVAR,'%nini',1,2101) -LexToken(NUMBER,'-1',1,2106) +LexToken(ADDITION,'-',1,2106) +LexToken(NUMBER,'1',1,2107) LexToken(COMMA,',',1,2108) LexToken(EOL,'\n',1,2109) LexToken(PREVAR,'%head',1,2126) LexToken(ASSIGNMENT,'=',1,2131) LexToken(PREVAR,'%head',1,2132) -LexToken(OPERATOR,'+',1,2137) +LexToken(ADDITION,'+',1,2137) LexToken(DQSTRING,'"u"',1,2140) -LexToken(OPERATOR,'+',1,2141) +LexToken(ADDITION,'+',1,2141) LexToken(VAR,'string',1,2142) LexToken(OPENBRACKET,'(',1,2148) LexToken(PREVAR,'%jji',1,2149) LexToken(CLOSEBRACKET,')',1,2153) -LexToken(OPERATOR,'+',1,2154) +LexToken(ADDITION,'+',1,2154) LexToken(DQSTRING,'","',1,2157) LexToken(COMMA,',',1,2158) LexToken(EOL,'\n',1,2159) @@ -274,14 +275,14 @@ LexToken(EOL,'\n',1,2175) LexToken(PREVAR,'%head',1,2188) LexToken(ASSIGNMENT,'=',1,2193) LexToken(PREVAR,'%head',1,2194) -LexToken(OPERATOR,'+',1,2199) +LexToken(ADDITION,'+',1,2199) LexToken(DQSTRING,'"u"',1,2202) -LexToken(OPERATOR,'+',1,2203) +LexToken(ADDITION,'+',1,2203) LexToken(VAR,'string',1,2204) LexToken(OPENBRACKET,'(',1,2210) LexToken(PREVAR,'%nini',1,2211) LexToken(CLOSEBRACKET,')',1,2216) -LexToken(OPERATOR,'+',1,2217) +LexToken(ADDITION,'+',1,2217) LexToken(DQSTRING,'")"',1,2220) LexToken(EOL,'\n',1,2221) LexToken(VAR,'ok',1,2234) @@ -365,7 +366,8 @@ LexToken(VAR,'model',1,2593) LexToken(COMMA,',',1,2598) LexToken(VAR,'graphics',1,2599) LexToken(COMMA,',',1,2607) -LexToken(NUMBER,'-1',1,2608) +LexToken(ADDITION,'-',1,2608) +LexToken(NUMBER,'1',1,2609) LexToken(COMMA,',',1,2610) LexToken(NUMBER,'1',1,2611) LexToken(COMMA,',',1,2612) @@ -716,7 +718,7 @@ LexToken(IF,'if',1,4337) LexToken(VAR,'execstr',1,4340) LexToken(OPENBRACKET,'(',1,4347) LexToken(PREVAR,'%mi',1,4348) -LexToken(OPERATOR,'+',1,4351) +LexToken(ADDITION,'+',1,4351) LexToken(DQSTRING,'"=%scicos_context(%mi)"',1,4374) LexToken(COMMA,',',1,4375) LexToken(DQSTRING,'"errcatch"',1,4385) @@ -985,7 +987,7 @@ LexToken(EOL,'\n',1,5242) LexToken(PREVAR,'%ijk',1,5251) LexToken(ASSIGNMENT,'=',1,5255) LexToken(PREVAR,'%ijk',1,5256) -LexToken(OPERATOR,'+',1,5260) +LexToken(ADDITION,'+',1,5260) LexToken(NUMBER,'1',1,5261) LexToken(EOL,'\n',1,5262) LexToken(SELECT,'select',1,5271) @@ -1052,9 +1054,9 @@ LexToken(CLOSEBRACKET,')',1,5484) LexToken(OPENBRACKET,'(',1,5485) LexToken(NUMBER,'2',1,5486) LexToken(CLOSEBRACKET,')',1,5487) -LexToken(OPERATOR,'+',1,5488) +LexToken(ADDITION,'+',1,5488) LexToken(DQSTRING,'" must have "',1,5501) -LexToken(OPERATOR,'+',1,5502) +LexToken(ADDITION,'+',1,5502) LexToken(VAR,'string',1,5503) LexToken(OPENBRACKET,'(',1,5509) LexToken(PREVAR,'%num_arg',1,5510) @@ -1062,7 +1064,7 @@ LexToken(OPENBRACKET,'(',1,5518) LexToken(PREVAR,'%jjk',1,5519) LexToken(CLOSEBRACKET,')',1,5523) LexToken(CLOSEBRACKET,')',1,5524) -LexToken(OPERATOR,'+',1,5525) +LexToken(ADDITION,'+',1,5525) LexToken(DQSTRING,'" arguments"',1,5537) LexToken(CLOSEBRACKET,')',1,5538) LexToken(EOL,'\n',1,5539) @@ -1082,7 +1084,7 @@ LexToken(SEMICOLON,';',1,5646) LexToken(NUMBER,'5',1,5647) LexToken(SEMICOLON,';',1,5648) LexToken(NUMBER,'100',1,5649) -LexToken(OPERATOR,'+',1,5652) +LexToken(ADDITION,'+',1,5652) LexToken(PREVAR,'%jjk',1,5653) LexToken(CLOSESQBRACKET,']',1,5657) LexToken(EOL,'\n',1,5658) @@ -1090,7 +1092,7 @@ LexToken(IF,'if',1,5679) LexToken(VAR,'or',1,5682) LexToken(OPENBRACKET,'(',1,5684) LexToken(NUMBER,'100',1,5685) -LexToken(OPERATOR,'+',1,5688) +LexToken(ADDITION,'+',1,5688) LexToken(PREVAR,'%jjk',1,5689) LexToken(COMPARISON,'==',1,5693) LexToken(PREVAR,'%ZCR',1,5695) @@ -1100,7 +1102,7 @@ LexToken(EOL,'\n',1,5705) LexToken(PREVAR,'%nz',1,5730) LexToken(ASSIGNMENT,'=',1,5733) LexToken(PREVAR,'%nz',1,5734) -LexToken(OPERATOR,'+',1,5737) +LexToken(ADDITION,'+',1,5737) LexToken(NUMBER,'1',1,5738) LexToken(COMMA,',',1,5739) LexToken(EOL,'\n',1,5740) @@ -1109,7 +1111,7 @@ LexToken(EOL,'\n',1,5764) LexToken(PREVAR,'%ijk',1,5785) LexToken(ASSIGNMENT,'=',1,5789) LexToken(PREVAR,'%ijk',1,5790) -LexToken(OPERATOR,'+',1,5794) +LexToken(ADDITION,'+',1,5794) LexToken(NUMBER,'1',1,5795) LexToken(EOL,'\n',1,5796) LexToken(END,'end',1,5813) @@ -1152,12 +1154,12 @@ LexToken(EOL,'\n',1,5960) LexToken(VAR,'message',1,5985) LexToken(OPENBRACKET,'(',1,5992) LexToken(DQSTRING,'"Variable "',1,6003) -LexToken(OPERATOR,'+',1,6004) +LexToken(ADDITION,'+',1,6004) LexToken(PREVAR,'%MM',1,6005) LexToken(OPENBRACKET,'(',1,6008) LexToken(PREVAR,'%jjk',1,6009) LexToken(CLOSEBRACKET,')',1,6013) -LexToken(OPERATOR,'+',1,6014) +LexToken(ADDITION,'+',1,6014) LexToken(DQSTRING,'" is not defined."',1,6032) LexToken(CLOSEBRACKET,')',1,6033) LexToken(EOL,'\n',1,6034) @@ -1193,12 +1195,12 @@ LexToken(EOL,'\n',1,6207) LexToken(VAR,'message',1,6232) LexToken(OPENBRACKET,'(',1,6239) LexToken(DQSTRING,'"Variable "',1,6250) -LexToken(OPERATOR,'+',1,6251) +LexToken(ADDITION,'+',1,6251) LexToken(PREVAR,'%MM',1,6252) LexToken(OPENBRACKET,'(',1,6255) LexToken(PREVAR,'%jjk',1,6256) LexToken(CLOSEBRACKET,')',1,6260) -LexToken(OPERATOR,'+',1,6261) +LexToken(ADDITION,'+',1,6261) LexToken(DQSTRING,'" is not scalar."',1,6278) LexToken(CLOSEBRACKET,')',1,6279) LexToken(EOL,'\n',1,6280) @@ -1213,7 +1215,7 @@ LexToken(EOL,'\n',1,6366) LexToken(PREVAR,'%nrpar',1,6391) LexToken(ASSIGNMENT,'=',1,6397) LexToken(PREVAR,'%nrpar',1,6398) -LexToken(OPERATOR,'+',1,6404) +LexToken(ADDITION,'+',1,6404) LexToken(NUMBER,'1',1,6405) LexToken(EOL,'\n',1,6406) LexToken(PREVAR,'%rpar',1,6431) @@ -1274,7 +1276,7 @@ LexToken(EOL,'\n',1,6699) LexToken(VAR,'message',1,6724) LexToken(OPENBRACKET,'(',1,6731) LexToken(DQSTRING,'"Unknown variable "',1,6750) -LexToken(OPERATOR,'+',1,6751) +LexToken(ADDITION,'+',1,6751) LexToken(PREVAR,'%lst',1,6752) LexToken(OPENBRACKET,'(',1,6756) LexToken(PREVAR,'%ijk',1,6757) @@ -1383,7 +1385,7 @@ LexToken(EOL,'\n',1,7227) LexToken(PREVAR,'%nz',1,7248) LexToken(ASSIGNMENT,'=',1,7251) LexToken(PREVAR,'%nz',1,7252) -LexToken(OPERATOR,'+',1,7255) +LexToken(ADDITION,'+',1,7255) LexToken(NUMBER,'1',1,7256) LexToken(COMMA,',',1,7257) LexToken(EOL,'\n',1,7258) @@ -1398,7 +1400,7 @@ LexToken(EOL,'\n',1,7366) LexToken(PREVAR,'%nrpar',1,7379) LexToken(ASSIGNMENT,'=',1,7385) LexToken(PREVAR,'%nrpar',1,7386) -LexToken(OPERATOR,'+',1,7392) +LexToken(ADDITION,'+',1,7392) LexToken(NUMBER,'1',1,7393) LexToken(EOL,'\n',1,7394) LexToken(PREVAR,'%rpar',1,7407) diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index a630b176..16ad8c8f 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -335,7 +335,8 @@ LexToken(VAR,'orig',1,1944) LexToken(ASSIGNMENT,'=',1,1949) LexToken(OPENSQBRACKET,'[',1,1951) LexToken(NUMBER,'80',1,1952) -LexToken(NUMBER,'-80',1,1955) +LexToken(ADDITION,'-',1,1955) +LexToken(NUMBER,'80',1,1956) LexToken(CLOSESQBRACKET,']',1,1958) LexToken(SEMICOLON,';',1,1959) LexToken(EOL,'\n',1,1960) @@ -523,7 +524,8 @@ LexToken(VAR,'orig',1,2624) LexToken(ASSIGNMENT,'=',1,2629) LexToken(OPENSQBRACKET,'[',1,2631) LexToken(NUMBER,'110',1,2632) -LexToken(NUMBER,'-140',1,2636) +LexToken(ADDITION,'-',1,2636) +LexToken(NUMBER,'140',1,2637) LexToken(CLOSESQBRACKET,']',1,2640) LexToken(SEMICOLON,';',1,2641) LexToken(EOL,'\n',1,2642) @@ -606,7 +608,8 @@ LexToken(VAR,'ct',1,2929) LexToken(ASSIGNMENT,'=',1,2932) LexToken(OPENSQBRACKET,'[',1,2934) LexToken(NUMBER,'5',1,2935) -LexToken(NUMBER,'-1',1,2937) +LexToken(ADDITION,'-',1,2937) +LexToken(NUMBER,'1',1,2938) LexToken(CLOSESQBRACKET,']',1,2939) LexToken(SEMICOLON,';',1,2940) LexToken(EOL,'\n',1,2941) @@ -662,7 +665,8 @@ LexToken(VAR,'ct',1,3106) LexToken(ASSIGNMENT,'=',1,3109) LexToken(OPENSQBRACKET,'[',1,3111) LexToken(NUMBER,'5',1,3112) -LexToken(NUMBER,'-1',1,3114) +LexToken(ADDITION,'-',1,3114) +LexToken(NUMBER,'1',1,3115) LexToken(CLOSESQBRACKET,']',1,3116) LexToken(SEMICOLON,';',1,3117) LexToken(EOL,'\n',1,3118) @@ -764,7 +768,8 @@ LexToken(VAR,'ct',1,3431) LexToken(ASSIGNMENT,'=',1,3434) LexToken(OPENSQBRACKET,'[',1,3436) LexToken(NUMBER,'5',1,3437) -LexToken(NUMBER,'-1',1,3439) +LexToken(ADDITION,'-',1,3439) +LexToken(NUMBER,'1',1,3440) LexToken(CLOSESQBRACKET,']',1,3441) LexToken(SEMICOLON,';',1,3442) LexToken(EOL,'\n',1,3443) diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index 62264b22..95ed1c3e 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -165,7 +165,7 @@ LexToken(OPENSQBRACKET,'[',1,1302) LexToken(NUMBER,'1',1,1303) LexToken(NUMBER,'1',1,1305) LexToken(CLOSESQBRACKET,']',1,1306) -LexToken(OPERATOR,'/',1,1307) +LexToken(MULTIPLICATION,'/',1,1307) LexToken(NUMBER,'3',1,1308) LexToken(COMMA,',',1,1309) LexToken(VAR,'model',1,1310) diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 87606801..1e799398 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -237,12 +237,12 @@ LexToken(EOL,'\n',1,1791) LexToken(VAR,'message',1,1808) LexToken(OPENBRACKET,'(',1,1815) LexToken(DQSTRING,'"Incorrect operator "',1,1836) -LexToken(OPERATOR,'+',1,1837) +LexToken(ADDITION,'+',1,1837) LexToken(VAR,'string',1,1838) LexToken(OPENBRACKET,'(',1,1844) LexToken(VAR,'rule',1,1845) LexToken(CLOSEBRACKET,')',1,1849) -LexToken(OPERATOR,'+',1,1850) +LexToken(ADDITION,'+',1,1850) LexToken(DQSTRING,'" ; must be 0 to 5."',1,1870) LexToken(CLOSEBRACKET,')',1,1871) LexToken(SEMICOLON,';',1,1872) @@ -485,7 +485,7 @@ LexToken(EOL,'\n',1,3282) LexToken(VAR,'it',1,3303) LexToken(ASSIGNMENT,'=',1,3305) LexToken(VAR,'Datatype',1,3306) -LexToken(OPERATOR,'*',1,3314) +LexToken(MULTIPLICATION,'*',1,3314) LexToken(VAR,'ones',1,3315) LexToken(OPENBRACKET,'(',1,3319) LexToken(VAR,'nin',1,3320) @@ -502,15 +502,16 @@ LexToken(EOL,'\n',1,3360) LexToken(VAR,'in',1,3381) LexToken(ASSIGNMENT,'=',1,3383) LexToken(OPENSQBRACKET,'[',1,3384) -LexToken(OPERATOR,'-',1,3385) +LexToken(ADDITION,'-',1,3385) LexToken(VAR,'ones',1,3386) LexToken(OPENBRACKET,'(',1,3390) LexToken(VAR,'nin',1,3391) LexToken(COMMA,',',1,3394) LexToken(NUMBER,'1',1,3395) LexToken(CLOSEBRACKET,')',1,3396) -LexToken(NUMBER,'-2',1,3398) -LexToken(OPERATOR,'*',1,3400) +LexToken(ADDITION,'-',1,3398) +LexToken(NUMBER,'2',1,3399) +LexToken(MULTIPLICATION,'*',1,3400) LexToken(VAR,'ones',1,3401) LexToken(OPENBRACKET,'(',1,3405) LexToken(VAR,'nin',1,3406) @@ -580,8 +581,10 @@ LexToken(EOL,'\n',1,3617) LexToken(VAR,'out',1,3642) LexToken(ASSIGNMENT,'=',1,3645) LexToken(OPENSQBRACKET,'[',1,3646) -LexToken(NUMBER,'-1',1,3647) -LexToken(NUMBER,'-2',1,3650) +LexToken(ADDITION,'-',1,3647) +LexToken(NUMBER,'1',1,3648) +LexToken(ADDITION,'-',1,3650) +LexToken(NUMBER,'2',1,3651) LexToken(CLOSESQBRACKET,']',1,3652) LexToken(EOL,'\n',1,3653) LexToken(OPENSQBRACKET,'[',1,3678) @@ -708,7 +711,7 @@ LexToken(VAR,'style',1,4400) LexToken(ASSIGNMENT,'=',1,4406) LexToken(OPENSQBRACKET,'[',1,4408) LexToken(DQSTRING,'"blockWithLabel;displayedLabel="',1,4440) -LexToken(OPERATOR,'+',1,4441) +LexToken(ADDITION,'+',1,4441) LexToken(VAR,'label',1,4442) LexToken(CLOSESQBRACKET,']',1,4447) LexToken(SEMICOLON,';',1,4448) @@ -741,9 +744,11 @@ LexToken(EOL,'\n',1,4621) LexToken(VAR,'in',1,4630) LexToken(ASSIGNMENT,'=',1,4632) LexToken(OPENSQBRACKET,'[',1,4633) -LexToken(NUMBER,'-1',1,4634) +LexToken(ADDITION,'-',1,4634) +LexToken(NUMBER,'1',1,4635) LexToken(SEMICOLON,';',1,4636) -LexToken(NUMBER,'-1',1,4637) +LexToken(ADDITION,'-',1,4637) +LexToken(NUMBER,'1',1,4638) LexToken(CLOSESQBRACKET,']',1,4639) LexToken(EOL,'\n',1,4640) LexToken(VAR,'ipar',1,4649) @@ -784,7 +789,8 @@ LexToken(VAR,'model',1,4768) LexToken(DOT,'.',1,4773) LexToken(VAR,'out',1,4774) LexToken(ASSIGNMENT,'=',1,4777) -LexToken(NUMBER,'-1',1,4778) +LexToken(ADDITION,'-',1,4778) +LexToken(NUMBER,'1',1,4779) LexToken(EOL,'\n',1,4780) LexToken(VAR,'model',1,4789) LexToken(DOT,'.',1,4794) diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index ebbf80a2..1f8533a4 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -127,7 +127,7 @@ LexToken(EOL,'\n',1,1270) LexToken(VAR,'paramv',1,1287) LexToken(OPENBRACKET,'(',1,1293) LexToken(LASTINDEX,'$',1,1294) -LexToken(OPERATOR,'+',1,1295) +LexToken(ADDITION,'+',1,1295) LexToken(NUMBER,'1',1,1296) LexToken(CLOSEBRACKET,')',1,1297) LexToken(ASSIGNMENT,'=',1,1298) @@ -144,7 +144,7 @@ LexToken(EOL,'\n',1,1320) LexToken(VAR,'pprop',1,1337) LexToken(OPENBRACKET,'(',1,1342) LexToken(LASTINDEX,'$',1,1343) -LexToken(OPERATOR,'+',1,1344) +LexToken(ADDITION,'+',1,1344) LexToken(NUMBER,'1',1,1345) LexToken(CLOSEBRACKET,')',1,1346) LexToken(ASSIGNMENT,'=',1,1348) @@ -354,31 +354,38 @@ LexToken(VAR,'list',1,3357) LexToken(OPENBRACKET,'(',1,3361) LexToken(DQSTRING,'"str"',1,3366) LexToken(COMMA,',',1,3367) -LexToken(NUMBER,'-1',1,3368) +LexToken(ADDITION,'-',1,3368) +LexToken(NUMBER,'1',1,3369) LexToken(COMMA,',',1,3370) LexToken(DQSTRING,'"str"',1,3375) LexToken(COMMA,',',1,3376) -LexToken(NUMBER,'-1',1,3377) +LexToken(ADDITION,'-',1,3377) +LexToken(NUMBER,'1',1,3378) LexToken(COMMA,',',1,3379) LexToken(DQSTRING,'"str"',1,3384) LexToken(COMMA,',',1,3385) -LexToken(NUMBER,'-1',1,3386) +LexToken(ADDITION,'-',1,3386) +LexToken(NUMBER,'1',1,3387) LexToken(COMMA,',',1,3388) LexToken(DQSTRING,'"str"',1,3393) LexToken(COMMA,',',1,3394) -LexToken(NUMBER,'-1',1,3395) +LexToken(ADDITION,'-',1,3395) +LexToken(NUMBER,'1',1,3396) LexToken(COMMA,',',1,3397) LexToken(DQSTRING,'"str"',1,3402) LexToken(COMMA,',',1,3403) -LexToken(NUMBER,'-1',1,3404) +LexToken(ADDITION,'-',1,3404) +LexToken(NUMBER,'1',1,3405) LexToken(COMMA,',',1,3406) LexToken(DQSTRING,'"vec"',1,3426) LexToken(COMMA,',',1,3427) -LexToken(NUMBER,'-1',1,3428) +LexToken(ADDITION,'-',1,3428) +LexToken(NUMBER,'1',1,3429) LexToken(COMMA,',',1,3430) LexToken(DQSTRING,'"str"',1,3435) LexToken(COMMA,',',1,3436) -LexToken(NUMBER,'-1',1,3437) +LexToken(ADDITION,'-',1,3437) +LexToken(NUMBER,'1',1,3438) LexToken(CLOSEBRACKET,')',1,3439) LexToken(COMMA,',',1,3440) LexToken(VAR,'lab_1',1,3441) @@ -497,21 +504,21 @@ LexToken(VAR,'messagebox',1,5029) LexToken(OPENBRACKET,'(',1,5039) LexToken(OPENSQBRACKET,'[',1,5040) LexToken(DQSTRING,'"Invalid variable name for the input "',1,5078) -LexToken(OPERATOR,'+',1,5079) +LexToken(ADDITION,'+',1,5079) LexToken(VAR,'string',1,5080) LexToken(OPENBRACKET,'(',1,5086) LexToken(VAR,'i',1,5087) LexToken(CLOSEBRACKET,')',1,5088) -LexToken(OPERATOR,'+',1,5089) +LexToken(ADDITION,'+',1,5089) LexToken(DQSTRING,'"."',1,5092) LexToken(SEMICOLON,';',1,5093) LexToken(DQSTRING,'"\\""',1,5118) -LexToken(OPERATOR,'+',1,5119) +LexToken(ADDITION,'+',1,5119) LexToken(VAR,'in',1,5120) LexToken(OPENBRACKET,'(',1,5122) LexToken(VAR,'i',1,5123) LexToken(CLOSEBRACKET,')',1,5124) -LexToken(OPERATOR,'+',1,5125) +LexToken(ADDITION,'+',1,5125) LexToken(DQSTRING,'"\\""',1,5129) LexToken(SEMICOLON,';',1,5130) LexToken(DQSTRING,'"Please choose another variable name."',1,5189) @@ -582,21 +589,21 @@ LexToken(VAR,'messagebox',1,5600) LexToken(OPENBRACKET,'(',1,5610) LexToken(OPENSQBRACKET,'[',1,5611) LexToken(DQSTRING,'"Invalid variable name for the output "',1,5650) -LexToken(OPERATOR,'+',1,5651) +LexToken(ADDITION,'+',1,5651) LexToken(VAR,'string',1,5652) LexToken(OPENBRACKET,'(',1,5658) LexToken(VAR,'i',1,5659) LexToken(CLOSEBRACKET,')',1,5660) -LexToken(OPERATOR,'+',1,5661) +LexToken(ADDITION,'+',1,5661) LexToken(DQSTRING,'"."',1,5664) LexToken(SEMICOLON,';',1,5665) LexToken(DQSTRING,'"\\""',1,5690) -LexToken(OPERATOR,'+',1,5691) +LexToken(ADDITION,'+',1,5691) LexToken(VAR,'out',1,5692) LexToken(OPENBRACKET,'(',1,5695) LexToken(VAR,'i',1,5696) LexToken(CLOSEBRACKET,')',1,5697) -LexToken(OPERATOR,'+',1,5698) +LexToken(ADDITION,'+',1,5698) LexToken(DQSTRING,'"\\""',1,5702) LexToken(SEMICOLON,';',1,5703) LexToken(DQSTRING,'"Please choose another variable name."',1,5762) @@ -674,21 +681,21 @@ LexToken(VAR,'messagebox',1,6210) LexToken(OPENBRACKET,'(',1,6220) LexToken(OPENSQBRACKET,'[',1,6221) LexToken(DQSTRING,'"Invalid variable name for the parameter "',1,6263) -LexToken(OPERATOR,'+',1,6264) +LexToken(ADDITION,'+',1,6264) LexToken(VAR,'string',1,6265) LexToken(OPENBRACKET,'(',1,6271) LexToken(VAR,'i',1,6272) LexToken(CLOSEBRACKET,')',1,6273) -LexToken(OPERATOR,'+',1,6274) +LexToken(ADDITION,'+',1,6274) LexToken(DQSTRING,'"."',1,6277) LexToken(SEMICOLON,';',1,6278) LexToken(DQSTRING,'"\\""',1,6303) -LexToken(OPERATOR,'+',1,6304) +LexToken(ADDITION,'+',1,6304) LexToken(VAR,'param',1,6305) LexToken(OPENBRACKET,'(',1,6310) LexToken(VAR,'i',1,6311) LexToken(CLOSEBRACKET,')',1,6312) -LexToken(OPERATOR,'+',1,6313) +LexToken(ADDITION,'+',1,6313) LexToken(DQSTRING,'"\\""',1,6317) LexToken(SEMICOLON,';',1,6318) LexToken(DQSTRING,'"Please choose another variable name."',1,6377) @@ -1233,7 +1240,7 @@ LexToken(NUMBER,'1',1,10287) LexToken(COLON,':',1,10288) LexToken(OPENBRACKET,'(',1,10289) LexToken(VAR,'Tparam_sz',1,10290) -LexToken(OPERATOR,'-',1,10299) +LexToken(ADDITION,'-',1,10299) LexToken(VAR,'lstsize',1,10300) LexToken(OPENBRACKET,'(',1,10307) LexToken(VAR,'lab_2',1,10308) @@ -1243,7 +1250,7 @@ LexToken(EOL,'\n',1,10315) LexToken(VAR,'lab_2',1,10340) LexToken(OPENBRACKET,'(',1,10345) LexToken(LASTINDEX,'$',1,10346) -LexToken(OPERATOR,'+',1,10347) +LexToken(ADDITION,'+',1,10347) LexToken(NUMBER,'1',1,10348) LexToken(CLOSEBRACKET,')',1,10349) LexToken(ASSIGNMENT,'=',1,10350) @@ -1282,7 +1289,7 @@ LexToken(VAR,'lstsize',1,10554) LexToken(OPENBRACKET,'(',1,10561) LexToken(VAR,'lab_2',1,10562) LexToken(CLOSEBRACKET,')',1,10567) -LexToken(OPERATOR,'-',1,10568) +LexToken(ADDITION,'-',1,10568) LexToken(VAR,'Tparam_sz',1,10569) LexToken(CLOSEBRACKET,')',1,10578) LexToken(EOL,'\n',1,10579) @@ -1336,14 +1343,14 @@ LexToken(EOL,'\n',1,11019) LexToken(VAR,'lhs_txt',1,11044) LexToken(ASSIGNMENT,'=',1,11051) LexToken(VAR,'lhs_txt',1,11052) -LexToken(OPERATOR,'+',1,11059) +LexToken(ADDITION,'+',1,11059) LexToken(DQSTRING,'"%v"',1,11063) -LexToken(OPERATOR,'+',1,11064) +LexToken(ADDITION,'+',1,11064) LexToken(VAR,'string',1,11065) LexToken(OPENBRACKET,'(',1,11071) LexToken(VAR,'i',1,11072) LexToken(CLOSEBRACKET,')',1,11073) -LexToken(OPERATOR,'+',1,11074) +LexToken(ADDITION,'+',1,11074) LexToken(DQSTRING,'","',1,11077) LexToken(EOL,'\n',1,11078) LexToken(IF,'if',1,11103) @@ -1358,14 +1365,14 @@ LexToken(EOL,'\n',1,11124) LexToken(VAR,'lab_txt',1,11153) LexToken(ASSIGNMENT,'=',1,11160) LexToken(VAR,'lab_txt',1,11161) -LexToken(OPERATOR,'+',1,11168) +LexToken(ADDITION,'+',1,11168) LexToken(DQSTRING,'"\\\'"',1,11172) -LexToken(OPERATOR,'+',1,11173) +LexToken(ADDITION,'+',1,11173) LexToken(VAR,'Tparam_lab',1,11174) LexToken(OPENBRACKET,'(',1,11184) LexToken(VAR,'i',1,11185) LexToken(CLOSEBRACKET,')',1,11186) -LexToken(OPERATOR,'+',1,11187) +LexToken(ADDITION,'+',1,11187) LexToken(DQSTRING,'"\\\';"',1,11192) LexToken(EOL,'\n',1,11193) LexToken(ELSEIF,'elseif',1,11218) @@ -1380,14 +1387,14 @@ LexToken(EOL,'\n',1,11244) LexToken(VAR,'lab_txt',1,11273) LexToken(ASSIGNMENT,'=',1,11280) LexToken(VAR,'lab_txt',1,11281) -LexToken(OPERATOR,'+',1,11288) +LexToken(ADDITION,'+',1,11288) LexToken(DQSTRING,'"\\\'"',1,11292) -LexToken(OPERATOR,'+',1,11293) +LexToken(ADDITION,'+',1,11293) LexToken(VAR,'Tparam_lab',1,11294) LexToken(OPENBRACKET,'(',1,11304) LexToken(VAR,'i',1,11305) LexToken(CLOSEBRACKET,')',1,11306) -LexToken(OPERATOR,'+',1,11307) +LexToken(ADDITION,'+',1,11307) LexToken(DQSTRING,'" (state) \\\';"',1,11321) LexToken(EOL,'\n',1,11322) LexToken(ELSEIF,'elseif',1,11347) @@ -1402,14 +1409,14 @@ LexToken(EOL,'\n',1,11373) LexToken(VAR,'lab_txt',1,11402) LexToken(ASSIGNMENT,'=',1,11409) LexToken(VAR,'lab_txt',1,11410) -LexToken(OPERATOR,'+',1,11417) +LexToken(ADDITION,'+',1,11417) LexToken(DQSTRING,'"\\\'"',1,11421) -LexToken(OPERATOR,'+',1,11422) +LexToken(ADDITION,'+',1,11422) LexToken(VAR,'Tparam_lab',1,11423) LexToken(OPENBRACKET,'(',1,11433) LexToken(VAR,'i',1,11434) LexToken(CLOSEBRACKET,')',1,11435) -LexToken(OPERATOR,'+',1,11436) +LexToken(ADDITION,'+',1,11436) LexToken(DQSTRING,'" (fixed state) \\\';"',1,11456) LexToken(EOL,'\n',1,11457) LexToken(END,'end',1,11482) @@ -1417,7 +1424,7 @@ LexToken(EOL,'\n',1,11485) LexToken(VAR,'rhs_txt',1,11510) LexToken(ASSIGNMENT,'=',1,11517) LexToken(VAR,'rhs_txt',1,11518) -LexToken(OPERATOR,'+',1,11525) +LexToken(ADDITION,'+',1,11525) LexToken(DQSTRING,'"\\\'vec\\\',-1,"',1,11538) LexToken(EOL,'\n',1,11539) LexToken(END,'end',1,11560) @@ -1434,7 +1441,8 @@ LexToken(VAR,'length',1,11607) LexToken(OPENBRACKET,'(',1,11613) LexToken(VAR,'lhs_txt',1,11614) LexToken(CLOSEBRACKET,')',1,11621) -LexToken(NUMBER,'-1',1,11622) +LexToken(ADDITION,'-',1,11622) +LexToken(NUMBER,'1',1,11623) LexToken(CLOSEBRACKET,')',1,11624) LexToken(EOL,'\n',1,11625) LexToken(VAR,'lab_txt',1,11646) @@ -1449,7 +1457,8 @@ LexToken(VAR,'length',1,11669) LexToken(OPENBRACKET,'(',1,11675) LexToken(VAR,'lab_txt',1,11676) LexToken(CLOSEBRACKET,')',1,11683) -LexToken(NUMBER,'-1',1,11684) +LexToken(ADDITION,'-',1,11684) +LexToken(NUMBER,'1',1,11685) LexToken(CLOSEBRACKET,')',1,11686) LexToken(EOL,'\n',1,11687) LexToken(VAR,'rhs_txt',1,11708) @@ -1464,7 +1473,8 @@ LexToken(VAR,'length',1,11731) LexToken(OPENBRACKET,'(',1,11737) LexToken(VAR,'rhs_txt',1,11738) LexToken(CLOSEBRACKET,')',1,11745) -LexToken(NUMBER,'-1',1,11746) +LexToken(ADDITION,'-',1,11746) +LexToken(NUMBER,'1',1,11747) LexToken(CLOSEBRACKET,')',1,11748) LexToken(EOL,'\n',1,11749) LexToken(EOL,'\n',1,11750) @@ -1473,19 +1483,19 @@ LexToken(EOL,'\n',1,11889) LexToken(VAR,'getvalue_txt',1,11910) LexToken(ASSIGNMENT,'=',1,11923) LexToken(DQSTRING,'"[ok,"',1,11930) -LexToken(OPERATOR,'+',1,11931) +LexToken(ADDITION,'+',1,11931) LexToken(VAR,'lhs_txt',1,11932) -LexToken(OPERATOR,'+',1,11939) +LexToken(ADDITION,'+',1,11939) LexToken(DQSTRING,'",lab_2]=scicos_getvalue(\\\'Set parameters values\\\',["',1,11992) -LexToken(OPERATOR,'+',1,11993) +LexToken(ADDITION,'+',1,11993) LexToken(VAR,'lab_txt',1,12017) -LexToken(OPERATOR,'+',1,12024) +LexToken(ADDITION,'+',1,12024) LexToken(DQSTRING,'"],"',1,12028) -LexToken(OPERATOR,'+',1,12029) +LexToken(ADDITION,'+',1,12029) LexToken(DQSTRING,'"list("',1,12059) -LexToken(OPERATOR,'+',1,12060) +LexToken(ADDITION,'+',1,12060) LexToken(VAR,'rhs_txt',1,12061) -LexToken(OPERATOR,'+',1,12068) +LexToken(ADDITION,'+',1,12068) LexToken(DQSTRING,'"),lab_2)"',1,12078) LexToken(EOL,'\n',1,12079) LexToken(EOL,'\n',1,12080) @@ -1538,14 +1548,14 @@ LexToken(EOL,'\n',1,12533) LexToken(VAR,'execstr',1,12554) LexToken(OPENBRACKET,'(',1,12561) LexToken(DQSTRING,'"paramv("',1,12570) -LexToken(OPERATOR,'+',1,12571) +LexToken(ADDITION,'+',1,12571) LexToken(VAR,'string',1,12572) LexToken(OPENBRACKET,'(',1,12578) LexToken(VAR,'i',1,12579) LexToken(CLOSEBRACKET,')',1,12580) -LexToken(OPERATOR,'+',1,12581) +LexToken(ADDITION,'+',1,12581) LexToken(DQSTRING,'")=%v"',1,12587) -LexToken(OPERATOR,'+',1,12588) +LexToken(ADDITION,'+',1,12588) LexToken(VAR,'string',1,12589) LexToken(OPENBRACKET,'(',1,12595) LexToken(VAR,'i',1,12596) @@ -1948,9 +1958,9 @@ LexToken(NUMBER,'1',1,15001) LexToken(CLOSEBRACKET,')',1,15002) LexToken(ASSIGNMENT,'=',1,15003) LexToken(DQSTRING,'"txt=[\\\'Modelica\\\';\\\' "',1,15026) -LexToken(OPERATOR,'+',1,15028) +LexToken(ADDITION,'+',1,15028) LexToken(VAR,'nameF',1,15030) -LexToken(OPERATOR,'+',1,15036) +LexToken(ADDITION,'+',1,15036) LexToken(DQSTRING,'" \\\'];"',1,15044) LexToken(EOL,'\n',1,15045) LexToken(VAR,'graphics',1,15062) diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index b175a629..b7d25fb0 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -115,7 +115,8 @@ LexToken(VAR,'list',1,1204) LexToken(OPENBRACKET,'(',1,1208) LexToken(DQSTRING,'"vec"',1,1213) LexToken(COMMA,',',1,1214) -LexToken(NUMBER,'-1',1,1215) +LexToken(ADDITION,'-',1,1215) +LexToken(NUMBER,'1',1,1216) LexToken(COMMA,',',1,1217) LexToken(DQSTRING,'"vec"',1,1222) LexToken(COMMA,',',1,1223) @@ -170,9 +171,11 @@ LexToken(VAR,'model',1,1445) LexToken(COMMA,',',1,1450) LexToken(VAR,'graphics',1,1451) LexToken(COMMA,',',1,1459) -LexToken(NUMBER,'-1',1,1460) +LexToken(ADDITION,'-',1,1460) +LexToken(NUMBER,'1',1,1461) LexToken(COMMA,',',1,1462) -LexToken(NUMBER,'-1',1,1463) +LexToken(ADDITION,'-',1,1463) +LexToken(NUMBER,'1',1,1464) LexToken(COMMA,',',1,1465) LexToken(VAR,'inh',1,1466) LexToken(COMMA,',',1,1469) diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 60ab1bee..c595b4eb 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -129,7 +129,7 @@ LexToken(EOL,'\n',1,1310) LexToken(VAR,'paramv',1,1327) LexToken(OPENBRACKET,'(',1,1333) LexToken(LASTINDEX,'$',1,1334) -LexToken(OPERATOR,'+',1,1335) +LexToken(ADDITION,'+',1,1335) LexToken(NUMBER,'1',1,1336) LexToken(CLOSEBRACKET,')',1,1337) LexToken(ASSIGNMENT,'=',1,1338) @@ -146,7 +146,7 @@ LexToken(EOL,'\n',1,1360) LexToken(VAR,'pprop',1,1377) LexToken(OPENBRACKET,'(',1,1382) LexToken(LASTINDEX,'$',1,1383) -LexToken(OPERATOR,'+',1,1384) +LexToken(ADDITION,'+',1,1384) LexToken(NUMBER,'1',1,1385) LexToken(CLOSEBRACKET,')',1,1386) LexToken(ASSIGNMENT,'=',1,1388) @@ -355,31 +355,38 @@ LexToken(VAR,'list',1,3384) LexToken(OPENBRACKET,'(',1,3388) LexToken(DQSTRING,'"str"',1,3393) LexToken(COMMA,',',1,3394) -LexToken(NUMBER,'-1',1,3395) +LexToken(ADDITION,'-',1,3395) +LexToken(NUMBER,'1',1,3396) LexToken(COMMA,',',1,3397) LexToken(DQSTRING,'"str"',1,3402) LexToken(COMMA,',',1,3403) -LexToken(NUMBER,'-1',1,3404) +LexToken(ADDITION,'-',1,3404) +LexToken(NUMBER,'1',1,3405) LexToken(COMMA,',',1,3406) LexToken(DQSTRING,'"str"',1,3411) LexToken(COMMA,',',1,3412) -LexToken(NUMBER,'-1',1,3413) +LexToken(ADDITION,'-',1,3413) +LexToken(NUMBER,'1',1,3414) LexToken(COMMA,',',1,3415) LexToken(DQSTRING,'"str"',1,3420) LexToken(COMMA,',',1,3421) -LexToken(NUMBER,'-1',1,3422) +LexToken(ADDITION,'-',1,3422) +LexToken(NUMBER,'1',1,3423) LexToken(COMMA,',',1,3424) LexToken(DQSTRING,'"str"',1,3429) LexToken(COMMA,',',1,3430) -LexToken(NUMBER,'-1',1,3431) +LexToken(ADDITION,'-',1,3431) +LexToken(NUMBER,'1',1,3432) LexToken(COMMA,',',1,3433) LexToken(DQSTRING,'"vec"',1,3453) LexToken(COMMA,',',1,3454) -LexToken(NUMBER,'-1',1,3455) +LexToken(ADDITION,'-',1,3455) +LexToken(NUMBER,'1',1,3456) LexToken(COMMA,',',1,3457) LexToken(DQSTRING,'"str"',1,3462) LexToken(COMMA,',',1,3463) -LexToken(NUMBER,'-1',1,3464) +LexToken(ADDITION,'-',1,3464) +LexToken(NUMBER,'1',1,3465) LexToken(CLOSEBRACKET,')',1,3466) LexToken(COMMA,',',1,3467) LexToken(VAR,'lab_1',1,3468) @@ -493,21 +500,21 @@ LexToken(VAR,'x_message',1,5020) LexToken(OPENBRACKET,'(',1,5029) LexToken(OPENSQBRACKET,'[',1,5030) LexToken(DQSTRING,'"Invalid variable name for the input "',1,5068) -LexToken(OPERATOR,'+',1,5069) +LexToken(ADDITION,'+',1,5069) LexToken(VAR,'string',1,5070) LexToken(OPENBRACKET,'(',1,5076) LexToken(VAR,'i',1,5077) LexToken(CLOSEBRACKET,')',1,5078) -LexToken(OPERATOR,'+',1,5079) +LexToken(ADDITION,'+',1,5079) LexToken(DQSTRING,'"."',1,5082) LexToken(SEMICOLON,';',1,5083) LexToken(DQSTRING,'"\\""',1,5108) -LexToken(OPERATOR,'+',1,5109) +LexToken(ADDITION,'+',1,5109) LexToken(VAR,'in',1,5110) LexToken(OPENBRACKET,'(',1,5112) LexToken(VAR,'i',1,5113) LexToken(CLOSEBRACKET,')',1,5114) -LexToken(OPERATOR,'+',1,5115) +LexToken(ADDITION,'+',1,5115) LexToken(DQSTRING,'"\\""',1,5119) LexToken(SEMICOLON,';',1,5120) LexToken(DQSTRING,'"Please choose another variable name."',1,5179) @@ -574,21 +581,21 @@ LexToken(VAR,'x_message',1,5575) LexToken(OPENBRACKET,'(',1,5584) LexToken(OPENSQBRACKET,'[',1,5585) LexToken(DQSTRING,'"Invalid variable name for the output "',1,5624) -LexToken(OPERATOR,'+',1,5625) +LexToken(ADDITION,'+',1,5625) LexToken(VAR,'string',1,5626) LexToken(OPENBRACKET,'(',1,5632) LexToken(VAR,'i',1,5633) LexToken(CLOSEBRACKET,')',1,5634) -LexToken(OPERATOR,'+',1,5635) +LexToken(ADDITION,'+',1,5635) LexToken(DQSTRING,'"."',1,5638) LexToken(SEMICOLON,';',1,5639) LexToken(DQSTRING,'"\\""',1,5664) -LexToken(OPERATOR,'+',1,5665) +LexToken(ADDITION,'+',1,5665) LexToken(VAR,'out',1,5666) LexToken(OPENBRACKET,'(',1,5669) LexToken(VAR,'i',1,5670) LexToken(CLOSEBRACKET,')',1,5671) -LexToken(OPERATOR,'+',1,5672) +LexToken(ADDITION,'+',1,5672) LexToken(DQSTRING,'"\\""',1,5676) LexToken(SEMICOLON,';',1,5677) LexToken(DQSTRING,'"Please choose another variable name."',1,5736) @@ -662,21 +669,21 @@ LexToken(VAR,'x_message',1,6169) LexToken(OPENBRACKET,'(',1,6178) LexToken(OPENSQBRACKET,'[',1,6179) LexToken(DQSTRING,'"Invalid variable name for the parameter "',1,6221) -LexToken(OPERATOR,'+',1,6222) +LexToken(ADDITION,'+',1,6222) LexToken(VAR,'string',1,6223) LexToken(OPENBRACKET,'(',1,6229) LexToken(VAR,'i',1,6230) LexToken(CLOSEBRACKET,')',1,6231) -LexToken(OPERATOR,'+',1,6232) +LexToken(ADDITION,'+',1,6232) LexToken(DQSTRING,'"."',1,6235) LexToken(SEMICOLON,';',1,6236) LexToken(DQSTRING,'"\\""',1,6261) -LexToken(OPERATOR,'+',1,6262) +LexToken(ADDITION,'+',1,6262) LexToken(VAR,'param',1,6263) LexToken(OPENBRACKET,'(',1,6268) LexToken(VAR,'i',1,6269) LexToken(CLOSEBRACKET,')',1,6270) -LexToken(OPERATOR,'+',1,6271) +LexToken(ADDITION,'+',1,6271) LexToken(DQSTRING,'"\\""',1,6275) LexToken(SEMICOLON,';',1,6276) LexToken(DQSTRING,'"Please choose another variable name."',1,6335) @@ -1173,7 +1180,7 @@ LexToken(NUMBER,'1',1,10063) LexToken(COLON,':',1,10064) LexToken(OPENBRACKET,'(',1,10065) LexToken(VAR,'Tparam_sz',1,10066) -LexToken(OPERATOR,'-',1,10075) +LexToken(ADDITION,'-',1,10075) LexToken(VAR,'lstsize',1,10076) LexToken(OPENBRACKET,'(',1,10083) LexToken(VAR,'lab_2',1,10084) @@ -1183,7 +1190,7 @@ LexToken(EOL,'\n',1,10091) LexToken(VAR,'lab_2',1,10116) LexToken(OPENBRACKET,'(',1,10121) LexToken(LASTINDEX,'$',1,10122) -LexToken(OPERATOR,'+',1,10123) +LexToken(ADDITION,'+',1,10123) LexToken(NUMBER,'1',1,10124) LexToken(CLOSEBRACKET,')',1,10125) LexToken(ASSIGNMENT,'=',1,10126) @@ -1305,14 +1312,14 @@ LexToken(EOL,'\n',1,11010) LexToken(VAR,'lhs_txt',1,11035) LexToken(ASSIGNMENT,'=',1,11042) LexToken(VAR,'lhs_txt',1,11043) -LexToken(OPERATOR,'+',1,11050) +LexToken(ADDITION,'+',1,11050) LexToken(DQSTRING,'"%v"',1,11054) -LexToken(OPERATOR,'+',1,11055) +LexToken(ADDITION,'+',1,11055) LexToken(VAR,'string',1,11056) LexToken(OPENBRACKET,'(',1,11062) LexToken(VAR,'i',1,11063) LexToken(CLOSEBRACKET,')',1,11064) -LexToken(OPERATOR,'+',1,11065) +LexToken(ADDITION,'+',1,11065) LexToken(DQSTRING,'","',1,11068) LexToken(EOL,'\n',1,11069) LexToken(IF,'if',1,11094) @@ -1327,14 +1334,14 @@ LexToken(EOL,'\n',1,11115) LexToken(VAR,'lab_txt',1,11144) LexToken(ASSIGNMENT,'=',1,11151) LexToken(VAR,'lab_txt',1,11152) -LexToken(OPERATOR,'+',1,11159) +LexToken(ADDITION,'+',1,11159) LexToken(DQSTRING,'"\\\'"',1,11163) -LexToken(OPERATOR,'+',1,11164) +LexToken(ADDITION,'+',1,11164) LexToken(VAR,'Tparam_lab',1,11165) LexToken(OPENBRACKET,'(',1,11175) LexToken(VAR,'i',1,11176) LexToken(CLOSEBRACKET,')',1,11177) -LexToken(OPERATOR,'+',1,11178) +LexToken(ADDITION,'+',1,11178) LexToken(DQSTRING,'"\\\';"',1,11183) LexToken(EOL,'\n',1,11184) LexToken(ELSEIF,'elseif',1,11209) @@ -1349,14 +1356,14 @@ LexToken(EOL,'\n',1,11235) LexToken(VAR,'lab_txt',1,11264) LexToken(ASSIGNMENT,'=',1,11271) LexToken(VAR,'lab_txt',1,11272) -LexToken(OPERATOR,'+',1,11279) +LexToken(ADDITION,'+',1,11279) LexToken(DQSTRING,'"\\\'"',1,11283) -LexToken(OPERATOR,'+',1,11284) +LexToken(ADDITION,'+',1,11284) LexToken(VAR,'Tparam_lab',1,11285) LexToken(OPENBRACKET,'(',1,11295) LexToken(VAR,'i',1,11296) LexToken(CLOSEBRACKET,')',1,11297) -LexToken(OPERATOR,'+',1,11298) +LexToken(ADDITION,'+',1,11298) LexToken(DQSTRING,'" (state) \\\';"',1,11312) LexToken(EOL,'\n',1,11313) LexToken(ELSEIF,'elseif',1,11338) @@ -1371,14 +1378,14 @@ LexToken(EOL,'\n',1,11364) LexToken(VAR,'lab_txt',1,11393) LexToken(ASSIGNMENT,'=',1,11400) LexToken(VAR,'lab_txt',1,11401) -LexToken(OPERATOR,'+',1,11408) +LexToken(ADDITION,'+',1,11408) LexToken(DQSTRING,'"\\\'"',1,11412) -LexToken(OPERATOR,'+',1,11413) +LexToken(ADDITION,'+',1,11413) LexToken(VAR,'Tparam_lab',1,11414) LexToken(OPENBRACKET,'(',1,11424) LexToken(VAR,'i',1,11425) LexToken(CLOSEBRACKET,')',1,11426) -LexToken(OPERATOR,'+',1,11427) +LexToken(ADDITION,'+',1,11427) LexToken(DQSTRING,'" (fixed state) \\\';"',1,11447) LexToken(EOL,'\n',1,11448) LexToken(END,'end',1,11473) @@ -1386,7 +1393,7 @@ LexToken(EOL,'\n',1,11476) LexToken(VAR,'rhs_txt',1,11501) LexToken(ASSIGNMENT,'=',1,11508) LexToken(VAR,'rhs_txt',1,11509) -LexToken(OPERATOR,'+',1,11516) +LexToken(ADDITION,'+',1,11516) LexToken(DQSTRING,'"\\\'vec\\\',-1,"',1,11529) LexToken(EOL,'\n',1,11530) LexToken(END,'end',1,11551) @@ -1403,7 +1410,8 @@ LexToken(VAR,'length',1,11598) LexToken(OPENBRACKET,'(',1,11604) LexToken(VAR,'lhs_txt',1,11605) LexToken(CLOSEBRACKET,')',1,11612) -LexToken(NUMBER,'-1',1,11613) +LexToken(ADDITION,'-',1,11613) +LexToken(NUMBER,'1',1,11614) LexToken(CLOSEBRACKET,')',1,11615) LexToken(EOL,'\n',1,11616) LexToken(VAR,'lab_txt',1,11637) @@ -1418,7 +1426,8 @@ LexToken(VAR,'length',1,11660) LexToken(OPENBRACKET,'(',1,11666) LexToken(VAR,'lab_txt',1,11667) LexToken(CLOSEBRACKET,')',1,11674) -LexToken(NUMBER,'-1',1,11675) +LexToken(ADDITION,'-',1,11675) +LexToken(NUMBER,'1',1,11676) LexToken(CLOSEBRACKET,')',1,11677) LexToken(EOL,'\n',1,11678) LexToken(VAR,'rhs_txt',1,11699) @@ -1433,7 +1442,8 @@ LexToken(VAR,'length',1,11722) LexToken(OPENBRACKET,'(',1,11728) LexToken(VAR,'rhs_txt',1,11729) LexToken(CLOSEBRACKET,')',1,11736) -LexToken(NUMBER,'-1',1,11737) +LexToken(ADDITION,'-',1,11737) +LexToken(NUMBER,'1',1,11738) LexToken(CLOSEBRACKET,')',1,11739) LexToken(EOL,'\n',1,11740) LexToken(EOL,'\n',1,11741) @@ -1442,19 +1452,19 @@ LexToken(EOL,'\n',1,11873) LexToken(VAR,'getvalue_txt',1,11894) LexToken(ASSIGNMENT,'=',1,11907) LexToken(DQSTRING,'"[ok,"',1,11914) -LexToken(OPERATOR,'+',1,11915) +LexToken(ADDITION,'+',1,11915) LexToken(VAR,'lhs_txt',1,11916) -LexToken(OPERATOR,'+',1,11923) +LexToken(ADDITION,'+',1,11923) LexToken(DQSTRING,'",lab_2]=scicos_getvalue(\\\'Set parameters values\\\',["',1,11976) -LexToken(OPERATOR,'+',1,11977) +LexToken(ADDITION,'+',1,11977) LexToken(VAR,'lab_txt',1,12001) -LexToken(OPERATOR,'+',1,12008) +LexToken(ADDITION,'+',1,12008) LexToken(DQSTRING,'"],"',1,12012) -LexToken(OPERATOR,'+',1,12013) +LexToken(ADDITION,'+',1,12013) LexToken(DQSTRING,'"list("',1,12043) -LexToken(OPERATOR,'+',1,12044) +LexToken(ADDITION,'+',1,12044) LexToken(VAR,'rhs_txt',1,12045) -LexToken(OPERATOR,'+',1,12052) +LexToken(ADDITION,'+',1,12052) LexToken(DQSTRING,'"),lab_2)"',1,12062) LexToken(EOL,'\n',1,12063) LexToken(EOL,'\n',1,12064) @@ -1507,14 +1517,14 @@ LexToken(EOL,'\n',1,12517) LexToken(VAR,'execstr',1,12538) LexToken(OPENBRACKET,'(',1,12545) LexToken(DQSTRING,'"paramv("',1,12554) -LexToken(OPERATOR,'+',1,12555) +LexToken(ADDITION,'+',1,12555) LexToken(VAR,'string',1,12556) LexToken(OPENBRACKET,'(',1,12562) LexToken(VAR,'i',1,12563) LexToken(CLOSEBRACKET,')',1,12564) -LexToken(OPERATOR,'+',1,12565) +LexToken(ADDITION,'+',1,12565) LexToken(DQSTRING,'")=%v"',1,12571) -LexToken(OPERATOR,'+',1,12572) +LexToken(ADDITION,'+',1,12572) LexToken(VAR,'string',1,12573) LexToken(OPENBRACKET,'(',1,12579) LexToken(VAR,'i',1,12580) @@ -1838,9 +1848,9 @@ LexToken(NUMBER,'1',1,14520) LexToken(CLOSEBRACKET,')',1,14521) LexToken(ASSIGNMENT,'=',1,14522) LexToken(DQSTRING,'"txt=[\\\' "',1,14532) -LexToken(OPERATOR,'+',1,14534) +LexToken(ADDITION,'+',1,14534) LexToken(VAR,'nameF',1,14536) -LexToken(OPERATOR,'+',1,14542) +LexToken(ADDITION,'+',1,14542) LexToken(DQSTRING,'" \\\'];"',1,14550) LexToken(EOL,'\n',1,14551) LexToken(VAR,'graphics',1,14568) diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 5ffa6d0f..3f9d2cd0 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -343,7 +343,8 @@ LexToken(SEMICOLON,';',1,2363) LexToken(EOL,'\n',1,2364) LexToken(VAR,'xmin',1,2373) LexToken(ASSIGNMENT,'=',1,2377) -LexToken(NUMBER,'-5',1,2378) +LexToken(ADDITION,'-',1,2378) +LexToken(NUMBER,'5',1,2379) LexToken(SEMICOLON,';',1,2380) LexToken(EOL,'\n',1,2381) LexToken(VAR,'xmax',1,2390) @@ -353,7 +354,8 @@ LexToken(SEMICOLON,';',1,2396) LexToken(EOL,'\n',1,2397) LexToken(VAR,'ymin',1,2406) LexToken(ASSIGNMENT,'=',1,2410) -LexToken(NUMBER,'-5',1,2411) +LexToken(ADDITION,'-',1,2411) +LexToken(NUMBER,'5',1,2412) LexToken(SEMICOLON,';',1,2413) LexToken(EOL,'\n',1,2414) LexToken(VAR,'ymax',1,2423) diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 45aee317..15845cbc 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -202,7 +202,8 @@ LexToken(THEN,'then',1,1650) LexToken(EOL,'\n',1,1654) LexToken(VAR,'minp',1,1663) LexToken(ASSIGNMENT,'=',1,1667) -LexToken(NUMBER,'-1',1,1668) +LexToken(ADDITION,'-',1,1668) +LexToken(NUMBER,'1',1,1669) LexToken(SEMICOLON,';',1,1670) LexToken(EOL,'\n',1,1671) LexToken(VAR,'maxp',1,1680) diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index ad626fd8..bd3237b3 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -205,12 +205,12 @@ LexToken(EOL,'\n',1,1648) LexToken(VAR,'message',1,1665) LexToken(OPENBRACKET,'(',1,1672) LexToken(DQSTRING,'"Incorrect operator "',1,1693) -LexToken(OPERATOR,'+',1,1694) +LexToken(ADDITION,'+',1,1694) LexToken(VAR,'string',1,1695) LexToken(OPENBRACKET,'(',1,1701) LexToken(VAR,'rule',1,1702) LexToken(CLOSEBRACKET,')',1,1706) -LexToken(OPERATOR,'+',1,1707) +LexToken(ADDITION,'+',1,1707) LexToken(DQSTRING,'" ; must be 0 to 5."',1,1727) LexToken(CLOSEBRACKET,')',1,1728) LexToken(EOL,'\n',1,1729) @@ -380,7 +380,7 @@ LexToken(EOL,'\n',1,2545) LexToken(VAR,'it',1,2562) LexToken(ASSIGNMENT,'=',1,2564) LexToken(VAR,'Datatype',1,2565) -LexToken(OPERATOR,'*',1,2573) +LexToken(MULTIPLICATION,'*',1,2573) LexToken(VAR,'ones',1,2574) LexToken(OPENBRACKET,'(',1,2578) LexToken(NUMBER,'1',1,2579) @@ -395,18 +395,24 @@ LexToken(EOL,'\n',1,2611) LexToken(VAR,'in',1,2628) LexToken(ASSIGNMENT,'=',1,2630) LexToken(OPENSQBRACKET,'[',1,2631) -LexToken(NUMBER,'-1',1,2632) -LexToken(NUMBER,'-2',1,2635) +LexToken(ADDITION,'-',1,2632) +LexToken(NUMBER,'1',1,2633) +LexToken(ADDITION,'-',1,2635) +LexToken(NUMBER,'2',1,2636) LexToken(SEMICOLON,';',1,2637) -LexToken(NUMBER,'-1',1,2638) -LexToken(NUMBER,'-2',1,2641) +LexToken(ADDITION,'-',1,2638) +LexToken(NUMBER,'1',1,2639) +LexToken(ADDITION,'-',1,2641) +LexToken(NUMBER,'2',1,2642) LexToken(CLOSESQBRACKET,']',1,2643) LexToken(EOL,'\n',1,2644) LexToken(VAR,'out',1,2661) LexToken(ASSIGNMENT,'=',1,2664) LexToken(OPENSQBRACKET,'[',1,2665) -LexToken(NUMBER,'-1',1,2666) -LexToken(NUMBER,'-2',1,2669) +LexToken(ADDITION,'-',1,2666) +LexToken(NUMBER,'1',1,2667) +LexToken(ADDITION,'-',1,2669) +LexToken(NUMBER,'2',1,2670) LexToken(CLOSESQBRACKET,']',1,2671) LexToken(EOL,'\n',1,2672) LexToken(OPENSQBRACKET,'[',1,2689) @@ -531,7 +537,7 @@ LexToken(VAR,'style',1,3351) LexToken(ASSIGNMENT,'=',1,3356) LexToken(OPENSQBRACKET,'[',1,3357) LexToken(DQSTRING,'"fontSize=13;fontStyle=1;displayedLabel="',1,3398) -LexToken(OPERATOR,'+',1,3399) +LexToken(ADDITION,'+',1,3399) LexToken(VAR,'label',1,3400) LexToken(CLOSESQBRACKET,']',1,3405) LexToken(SEMICOLON,';',1,3406) @@ -690,7 +696,7 @@ LexToken(VAR,'style',1,4007) LexToken(ASSIGNMENT,'=',1,4012) LexToken(OPENSQBRACKET,'[',1,4013) LexToken(DQSTRING,'"fontSize=13;fontStyle=1;displayedLabel="',1,4054) -LexToken(OPERATOR,'+',1,4055) +LexToken(ADDITION,'+',1,4055) LexToken(VAR,'label',1,4056) LexToken(CLOSESQBRACKET,']',1,4061) LexToken(SEMICOLON,';',1,4062) diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index d1935280..ce4c8105 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -96,7 +96,8 @@ LexToken(VAR,'model',1,1092) LexToken(DOT,'.',1,1097) LexToken(VAR,'in',1,1098) LexToken(ASSIGNMENT,'=',1,1108) -LexToken(NUMBER,'-1',1,1110) +LexToken(ADDITION,'-',1,1110) +LexToken(NUMBER,'1',1,1111) LexToken(SEMICOLON,';',1,1121) LexToken(EOL,'\n',1,1122) LexToken(VAR,'model',1,1131) @@ -104,11 +105,14 @@ LexToken(DOT,'.',1,1136) LexToken(VAR,'out',1,1137) LexToken(ASSIGNMENT,'=',1,1147) LexToken(OPENSQBRACKET,'[',1,1149) -LexToken(NUMBER,'-1',1,1150) +LexToken(ADDITION,'-',1,1150) +LexToken(NUMBER,'1',1,1151) LexToken(SEMICOLON,';',1,1152) -LexToken(NUMBER,'-1',1,1153) +LexToken(ADDITION,'-',1,1153) +LexToken(NUMBER,'1',1,1154) LexToken(SEMICOLON,';',1,1155) -LexToken(NUMBER,'-1',1,1156) +LexToken(ADDITION,'-',1,1156) +LexToken(NUMBER,'1',1,1157) LexToken(CLOSESQBRACKET,']',1,1158) LexToken(SEMICOLON,';',1,1160) LexToken(EOL,'\n',1,1161) @@ -138,7 +142,7 @@ LexToken(OPENSQBRACKET,'[',1,1279) LexToken(NUMBER,'1',1,1280) LexToken(NUMBER,'1',1,1282) LexToken(CLOSESQBRACKET,']',1,1283) -LexToken(OPERATOR,'/',1,1284) +LexToken(MULTIPLICATION,'/',1,1284) LexToken(NUMBER,'3',1,1285) LexToken(COMMA,',',1,1286) LexToken(VAR,'model',1,1287) diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 46d69228..6f7d7ea3 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -1,270 +1,270 @@ LexToken(EOL,'\n',1,10) LexToken(EOL,'\n',1,13) LexToken(EOL,'\n',1,73) -LexToken(EOL,'\n',1,153) -LexToken(EOL,'\n',1,156) -LexToken(EOL,'\n',1,228) -LexToken(EOL,'\n',1,300) -LexToken(EOL,'\n',1,369) -LexToken(EOL,'\n',1,408) -LexToken(EOL,'\n',1,411) -LexToken(EOL,'\n',1,478) -LexToken(EOL,'\n',1,544) -LexToken(EOL,'\n',1,609) -LexToken(EOL,'\n',1,657) -LexToken(EOL,'\n',1,660) -LexToken(EOL,'\n',1,729) -LexToken(EOL,'\n',1,792) -LexToken(EOL,'\n',1,874) -LexToken(EOL,'\n',1,877) -LexToken(EOL,'\n',1,908) -LexToken(EOL,'\n',1,911) +LexToken(EOL,'\n',1,154) +LexToken(EOL,'\n',1,157) +LexToken(EOL,'\n',1,229) +LexToken(EOL,'\n',1,301) +LexToken(EOL,'\n',1,370) +LexToken(EOL,'\n',1,409) +LexToken(EOL,'\n',1,412) +LexToken(EOL,'\n',1,479) +LexToken(EOL,'\n',1,545) +LexToken(EOL,'\n',1,610) +LexToken(EOL,'\n',1,658) +LexToken(EOL,'\n',1,661) +LexToken(EOL,'\n',1,730) +LexToken(EOL,'\n',1,793) +LexToken(EOL,'\n',1,875) +LexToken(EOL,'\n',1,878) +LexToken(EOL,'\n',1,909) LexToken(EOL,'\n',1,912) -LexToken(FUNCTION,'function',1,913) -LexToken(OPENSQBRACKET,'[',1,922) -LexToken(VAR,'x',1,923) -LexToken(COMMA,',',1,924) -LexToken(VAR,'y',1,925) -LexToken(COMMA,',',1,926) -LexToken(VAR,'typ',1,927) -LexToken(CLOSESQBRACKET,']',1,930) -LexToken(ASSIGNMENT,'=',1,931) -LexToken(VAR,'SUPER_f',1,932) -LexToken(OPENBRACKET,'(',1,939) -LexToken(VAR,'job',1,940) -LexToken(COMMA,',',1,943) -LexToken(VAR,'arg1',1,944) -LexToken(COMMA,',',1,948) -LexToken(VAR,'arg2',1,949) -LexToken(CLOSEBRACKET,')',1,953) -LexToken(EOL,'\n',1,954) -LexToken(VAR,'x',1,959) -LexToken(ASSIGNMENT,'=',1,960) -LexToken(OPENSQBRACKET,'[',1,961) -LexToken(CLOSESQBRACKET,']',1,962) -LexToken(SEMICOLON,';',1,963) -LexToken(EOL,'\n',1,964) -LexToken(VAR,'y',1,969) -LexToken(ASSIGNMENT,'=',1,970) -LexToken(OPENSQBRACKET,'[',1,971) -LexToken(CLOSESQBRACKET,']',1,972) -LexToken(SEMICOLON,';',1,973) -LexToken(EOL,'\n',1,974) -LexToken(VAR,'typ',1,979) -LexToken(ASSIGNMENT,'=',1,982) -LexToken(OPENSQBRACKET,'[',1,983) -LexToken(CLOSESQBRACKET,']',1,984) -LexToken(SEMICOLON,';',1,985) -LexToken(EOL,'\n',1,986) +LexToken(EOL,'\n',1,913) +LexToken(FUNCTION,'function',1,914) +LexToken(OPENSQBRACKET,'[',1,923) +LexToken(VAR,'x',1,924) +LexToken(COMMA,',',1,925) +LexToken(VAR,'y',1,926) +LexToken(COMMA,',',1,927) +LexToken(VAR,'typ',1,928) +LexToken(CLOSESQBRACKET,']',1,931) +LexToken(ASSIGNMENT,'=',1,932) +LexToken(VAR,'SUPER_f',1,933) +LexToken(OPENBRACKET,'(',1,940) +LexToken(VAR,'job',1,941) +LexToken(COMMA,',',1,944) +LexToken(VAR,'arg1',1,945) +LexToken(COMMA,',',1,949) +LexToken(VAR,'arg2',1,950) +LexToken(CLOSEBRACKET,')',1,954) +LexToken(EOL,'\n',1,955) +LexToken(VAR,'x',1,960) +LexToken(ASSIGNMENT,'=',1,961) +LexToken(OPENSQBRACKET,'[',1,962) +LexToken(CLOSESQBRACKET,']',1,963) +LexToken(SEMICOLON,';',1,964) +LexToken(EOL,'\n',1,965) +LexToken(VAR,'y',1,970) +LexToken(ASSIGNMENT,'=',1,971) +LexToken(OPENSQBRACKET,'[',1,972) +LexToken(CLOSESQBRACKET,']',1,973) +LexToken(SEMICOLON,';',1,974) +LexToken(EOL,'\n',1,975) +LexToken(VAR,'typ',1,980) +LexToken(ASSIGNMENT,'=',1,983) +LexToken(OPENSQBRACKET,'[',1,984) +LexToken(CLOSESQBRACKET,']',1,985) +LexToken(SEMICOLON,';',1,986) LexToken(EOL,'\n',1,987) -LexToken(SELECT,'select',1,992) -LexToken(VAR,'job',1,999) -LexToken(EOL,'\n',1,1002) -LexToken(CASE,'case',1,1007) -LexToken(DQSTRING,'"set"',1,1016) -LexToken(THEN,'then',1,1018) -LexToken(EOL,'\n',1,1022) -LexToken(EOL,'\n',1,1084) -LexToken(VAR,'xcos',1,1093) -LexToken(OPENBRACKET,'(',1,1097) -LexToken(VAR,'arg1',1,1098) -LexToken(DOT,'.',1,1102) -LexToken(VAR,'model',1,1103) -LexToken(DOT,'.',1,1108) -LexToken(VAR,'rpar',1,1109) -LexToken(CLOSEBRACKET,')',1,1113) -LexToken(SEMICOLON,';',1,1114) -LexToken(EOL,'\n',1,1115) +LexToken(EOL,'\n',1,988) +LexToken(SELECT,'select',1,993) +LexToken(VAR,'job',1,1000) +LexToken(EOL,'\n',1,1003) +LexToken(CASE,'case',1,1008) +LexToken(DQSTRING,'"set"',1,1017) +LexToken(THEN,'then',1,1019) +LexToken(EOL,'\n',1,1023) +LexToken(EOL,'\n',1,1085) +LexToken(VAR,'xcos',1,1094) +LexToken(OPENBRACKET,'(',1,1098) +LexToken(VAR,'arg1',1,1099) +LexToken(DOT,'.',1,1103) +LexToken(VAR,'model',1,1104) +LexToken(DOT,'.',1,1109) +LexToken(VAR,'rpar',1,1110) +LexToken(CLOSEBRACKET,')',1,1114) +LexToken(SEMICOLON,';',1,1115) LexToken(EOL,'\n',1,1116) -LexToken(CASE,'case',1,1121) -LexToken(DQSTRING,'"define"',1,1133) -LexToken(THEN,'then',1,1135) -LexToken(EOL,'\n',1,1139) -LexToken(EOL,'\n',1,1184) -LexToken(VAR,'scs',1,1193) -LexToken(ASSIGNMENT,'=',1,1196) -LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1197) -LexToken(OPENBRACKET,'(',1,1211) -LexToken(CLOSEBRACKET,')',1,1212) -LexToken(SEMICOLON,';',1,1213) -LexToken(EOL,'\n',1,1214) -LexToken(VAR,'scs',1,1223) -LexToken(DOT,'.',1,1226) -LexToken(VAR,'props',1,1227) -LexToken(DOT,'.',1,1232) -LexToken(VAR,'title',1,1233) -LexToken(ASSIGNMENT,'=',1,1238) -LexToken(DQSTRING,'"Super Block"',1,1251) -LexToken(SEMICOLON,';',1,1252) -LexToken(EOL,'\n',1,1253) +LexToken(EOL,'\n',1,1117) +LexToken(CASE,'case',1,1122) +LexToken(DQSTRING,'"define"',1,1134) +LexToken(THEN,'then',1,1136) +LexToken(EOL,'\n',1,1140) +LexToken(EOL,'\n',1,1185) +LexToken(VAR,'scs',1,1194) +LexToken(ASSIGNMENT,'=',1,1197) +LexToken(SCICOS_DIAGRAM,'scicos_diagram',1,1198) +LexToken(OPENBRACKET,'(',1,1212) +LexToken(CLOSEBRACKET,')',1,1213) +LexToken(SEMICOLON,';',1,1214) +LexToken(EOL,'\n',1,1215) +LexToken(VAR,'scs',1,1224) +LexToken(DOT,'.',1,1227) +LexToken(VAR,'props',1,1228) +LexToken(DOT,'.',1,1233) +LexToken(VAR,'title',1,1234) +LexToken(ASSIGNMENT,'=',1,1239) +LexToken(DQSTRING,'"Super Block"',1,1252) +LexToken(SEMICOLON,';',1,1253) LexToken(EOL,'\n',1,1254) -LexToken(VAR,'in',1,1263) -LexToken(ASSIGNMENT,'=',1,1266) -LexToken(VAR,'IN_f',1,1268) -LexToken(OPENBRACKET,'(',1,1272) -LexToken(DQSTRING,'"define"',1,1280) -LexToken(CLOSEBRACKET,')',1,1281) -LexToken(SEMICOLON,';',1,1282) -LexToken(EOL,'\n',1,1283) -LexToken(VAR,'in',1,1292) -LexToken(DOT,'.',1,1294) -LexToken(VAR,'graphics',1,1295) -LexToken(DOT,'.',1,1303) -LexToken(VAR,'orig',1,1304) -LexToken(ASSIGNMENT,'=',1,1309) -LexToken(OPENSQBRACKET,'[',1,1311) -LexToken(NUMBER,'40',1,1312) -LexToken(COMMA,',',1,1314) -LexToken(NUMBER,'40',1,1316) -LexToken(CLOSESQBRACKET,']',1,1318) -LexToken(SEMICOLON,';',1,1319) -LexToken(EOL,'\n',1,1320) -LexToken(VAR,'in',1,1329) -LexToken(DOT,'.',1,1331) -LexToken(VAR,'graphics',1,1332) -LexToken(DOT,'.',1,1340) -LexToken(VAR,'sz',1,1341) -LexToken(ASSIGNMENT,'=',1,1344) -LexToken(OPENSQBRACKET,'[',1,1346) -LexToken(NUMBER,'20',1,1347) -LexToken(COMMA,',',1,1349) -LexToken(NUMBER,'20',1,1351) -LexToken(CLOSESQBRACKET,']',1,1353) -LexToken(SEMICOLON,';',1,1354) -LexToken(EOL,'\n',1,1355) -LexToken(VAR,'out',1,1364) -LexToken(ASSIGNMENT,'=',1,1368) -LexToken(VAR,'OUT_f',1,1370) -LexToken(OPENBRACKET,'(',1,1375) -LexToken(DQSTRING,'"define"',1,1383) -LexToken(CLOSEBRACKET,')',1,1384) -LexToken(SEMICOLON,';',1,1385) -LexToken(EOL,'\n',1,1386) -LexToken(VAR,'out',1,1395) -LexToken(DOT,'.',1,1398) -LexToken(VAR,'graphics',1,1399) -LexToken(DOT,'.',1,1407) -LexToken(VAR,'orig',1,1408) -LexToken(ASSIGNMENT,'=',1,1413) -LexToken(OPENSQBRACKET,'[',1,1415) -LexToken(NUMBER,'240',1,1416) -LexToken(COMMA,',',1,1419) -LexToken(NUMBER,'40',1,1421) -LexToken(CLOSESQBRACKET,']',1,1423) -LexToken(SEMICOLON,';',1,1424) -LexToken(EOL,'\n',1,1425) -LexToken(VAR,'out',1,1434) -LexToken(DOT,'.',1,1437) -LexToken(VAR,'graphics',1,1438) -LexToken(DOT,'.',1,1446) -LexToken(VAR,'sz',1,1447) -LexToken(ASSIGNMENT,'=',1,1450) -LexToken(OPENSQBRACKET,'[',1,1452) -LexToken(NUMBER,'20',1,1453) -LexToken(COMMA,',',1,1455) -LexToken(NUMBER,'20',1,1457) -LexToken(CLOSESQBRACKET,']',1,1459) -LexToken(SEMICOLON,';',1,1460) -LexToken(EOL,'\n',1,1461) +LexToken(EOL,'\n',1,1255) +LexToken(VAR,'in',1,1264) +LexToken(ASSIGNMENT,'=',1,1267) +LexToken(VAR,'IN_f',1,1269) +LexToken(OPENBRACKET,'(',1,1273) +LexToken(DQSTRING,'"define"',1,1281) +LexToken(CLOSEBRACKET,')',1,1282) +LexToken(SEMICOLON,';',1,1283) +LexToken(EOL,'\n',1,1284) +LexToken(VAR,'in',1,1293) +LexToken(DOT,'.',1,1295) +LexToken(VAR,'graphics',1,1296) +LexToken(DOT,'.',1,1304) +LexToken(VAR,'orig',1,1305) +LexToken(ASSIGNMENT,'=',1,1310) +LexToken(OPENSQBRACKET,'[',1,1312) +LexToken(NUMBER,'40',1,1313) +LexToken(COMMA,',',1,1315) +LexToken(NUMBER,'40',1,1317) +LexToken(CLOSESQBRACKET,']',1,1319) +LexToken(SEMICOLON,';',1,1320) +LexToken(EOL,'\n',1,1321) +LexToken(VAR,'in',1,1330) +LexToken(DOT,'.',1,1332) +LexToken(VAR,'graphics',1,1333) +LexToken(DOT,'.',1,1341) +LexToken(VAR,'sz',1,1342) +LexToken(ASSIGNMENT,'=',1,1345) +LexToken(OPENSQBRACKET,'[',1,1347) +LexToken(NUMBER,'20',1,1348) +LexToken(COMMA,',',1,1350) +LexToken(NUMBER,'20',1,1352) +LexToken(CLOSESQBRACKET,']',1,1354) +LexToken(SEMICOLON,';',1,1355) +LexToken(EOL,'\n',1,1356) +LexToken(VAR,'out',1,1365) +LexToken(ASSIGNMENT,'=',1,1369) +LexToken(VAR,'OUT_f',1,1371) +LexToken(OPENBRACKET,'(',1,1376) +LexToken(DQSTRING,'"define"',1,1384) +LexToken(CLOSEBRACKET,')',1,1385) +LexToken(SEMICOLON,';',1,1386) +LexToken(EOL,'\n',1,1387) +LexToken(VAR,'out',1,1396) +LexToken(DOT,'.',1,1399) +LexToken(VAR,'graphics',1,1400) +LexToken(DOT,'.',1,1408) +LexToken(VAR,'orig',1,1409) +LexToken(ASSIGNMENT,'=',1,1414) +LexToken(OPENSQBRACKET,'[',1,1416) +LexToken(NUMBER,'240',1,1417) +LexToken(COMMA,',',1,1420) +LexToken(NUMBER,'40',1,1422) +LexToken(CLOSESQBRACKET,']',1,1424) +LexToken(SEMICOLON,';',1,1425) +LexToken(EOL,'\n',1,1426) +LexToken(VAR,'out',1,1435) +LexToken(DOT,'.',1,1438) +LexToken(VAR,'graphics',1,1439) +LexToken(DOT,'.',1,1447) +LexToken(VAR,'sz',1,1448) +LexToken(ASSIGNMENT,'=',1,1451) +LexToken(OPENSQBRACKET,'[',1,1453) +LexToken(NUMBER,'20',1,1454) +LexToken(COMMA,',',1,1456) +LexToken(NUMBER,'20',1,1458) +LexToken(CLOSESQBRACKET,']',1,1460) +LexToken(SEMICOLON,';',1,1461) LexToken(EOL,'\n',1,1462) -LexToken(VAR,'scs',1,1471) -LexToken(DOT,'.',1,1474) -LexToken(VAR,'objs',1,1475) -LexToken(OPENBRACKET,'(',1,1479) -LexToken(NUMBER,'1',1,1480) -LexToken(CLOSEBRACKET,')',1,1481) -LexToken(ASSIGNMENT,'=',1,1483) -LexToken(VAR,'in',1,1485) -LexToken(SEMICOLON,';',1,1487) -LexToken(EOL,'\n',1,1488) -LexToken(VAR,'scs',1,1497) -LexToken(DOT,'.',1,1500) -LexToken(VAR,'objs',1,1501) -LexToken(OPENBRACKET,'(',1,1505) -LexToken(NUMBER,'2',1,1506) -LexToken(CLOSEBRACKET,')',1,1507) -LexToken(ASSIGNMENT,'=',1,1509) -LexToken(VAR,'out',1,1511) -LexToken(SEMICOLON,';',1,1514) -LexToken(EOL,'\n',1,1515) +LexToken(EOL,'\n',1,1463) +LexToken(VAR,'scs',1,1472) +LexToken(DOT,'.',1,1475) +LexToken(VAR,'objs',1,1476) +LexToken(OPENBRACKET,'(',1,1480) +LexToken(NUMBER,'1',1,1481) +LexToken(CLOSEBRACKET,')',1,1482) +LexToken(ASSIGNMENT,'=',1,1484) +LexToken(VAR,'in',1,1486) +LexToken(SEMICOLON,';',1,1488) +LexToken(EOL,'\n',1,1489) +LexToken(VAR,'scs',1,1498) +LexToken(DOT,'.',1,1501) +LexToken(VAR,'objs',1,1502) +LexToken(OPENBRACKET,'(',1,1506) +LexToken(NUMBER,'2',1,1507) +LexToken(CLOSEBRACKET,')',1,1508) +LexToken(ASSIGNMENT,'=',1,1510) +LexToken(VAR,'out',1,1512) +LexToken(SEMICOLON,';',1,1515) LexToken(EOL,'\n',1,1516) -LexToken(EOL,'\n',1,1542) -LexToken(VAR,'model',1,1551) -LexToken(ASSIGNMENT,'=',1,1556) -LexToken(SCICOS_MODEL,'scicos_model',1,1557) -LexToken(OPENBRACKET,'(',1,1569) -LexToken(CLOSEBRACKET,')',1,1570) -LexToken(SEMICOLON,';',1,1571) -LexToken(EOL,'\n',1,1572) -LexToken(VAR,'model',1,1581) -LexToken(DOT,'.',1,1586) -LexToken(VAR,'sim',1,1587) -LexToken(ASSIGNMENT,'=',1,1590) -LexToken(DQSTRING,'"super"',1,1597) -LexToken(SEMICOLON,';',1,1598) -LexToken(EOL,'\n',1,1599) -LexToken(VAR,'model',1,1608) -LexToken(DOT,'.',1,1613) -LexToken(VAR,'in',1,1614) -LexToken(ASSIGNMENT,'=',1,1616) -LexToken(NUMBER,'1',1,1617) -LexToken(SEMICOLON,';',1,1618) -LexToken(EOL,'\n',1,1619) -LexToken(VAR,'model',1,1628) -LexToken(DOT,'.',1,1633) -LexToken(VAR,'out',1,1634) -LexToken(ASSIGNMENT,'=',1,1637) -LexToken(NUMBER,'1',1,1638) -LexToken(SEMICOLON,';',1,1639) -LexToken(EOL,'\n',1,1640) -LexToken(VAR,'model',1,1649) -LexToken(DOT,'.',1,1654) -LexToken(VAR,'rpar',1,1655) -LexToken(ASSIGNMENT,'=',1,1659) -LexToken(VAR,'scs',1,1660) -LexToken(SEMICOLON,';',1,1663) -LexToken(EOL,'\n',1,1664) -LexToken(VAR,'model',1,1673) -LexToken(DOT,'.',1,1678) -LexToken(VAR,'blocktype',1,1679) -LexToken(ASSIGNMENT,'=',1,1688) -LexToken(DQSTRING,'"h"',1,1691) -LexToken(SEMICOLON,';',1,1692) -LexToken(EOL,'\n',1,1693) -LexToken(VAR,'model',1,1702) -LexToken(DOT,'.',1,1707) -LexToken(VAR,'dep_ut',1,1708) -LexToken(ASSIGNMENT,'=',1,1714) -LexToken(OPENSQBRACKET,'[',1,1715) -LexToken(PREVAR_BOOLEAN,'%f',1,1716) -LexToken(PREVAR_BOOLEAN,'%f',1,1719) -LexToken(CLOSESQBRACKET,']',1,1721) -LexToken(SEMICOLON,';',1,1722) -LexToken(EOL,'\n',1,1723) +LexToken(EOL,'\n',1,1517) +LexToken(EOL,'\n',1,1543) +LexToken(VAR,'model',1,1552) +LexToken(ASSIGNMENT,'=',1,1557) +LexToken(SCICOS_MODEL,'scicos_model',1,1558) +LexToken(OPENBRACKET,'(',1,1570) +LexToken(CLOSEBRACKET,')',1,1571) +LexToken(SEMICOLON,';',1,1572) +LexToken(EOL,'\n',1,1573) +LexToken(VAR,'model',1,1582) +LexToken(DOT,'.',1,1587) +LexToken(VAR,'sim',1,1588) +LexToken(ASSIGNMENT,'=',1,1591) +LexToken(DQSTRING,'"super"',1,1598) +LexToken(SEMICOLON,';',1,1599) +LexToken(EOL,'\n',1,1600) +LexToken(VAR,'model',1,1609) +LexToken(DOT,'.',1,1614) +LexToken(VAR,'in',1,1615) +LexToken(ASSIGNMENT,'=',1,1617) +LexToken(NUMBER,'1',1,1618) +LexToken(SEMICOLON,';',1,1619) +LexToken(EOL,'\n',1,1620) +LexToken(VAR,'model',1,1629) +LexToken(DOT,'.',1,1634) +LexToken(VAR,'out',1,1635) +LexToken(ASSIGNMENT,'=',1,1638) +LexToken(NUMBER,'1',1,1639) +LexToken(SEMICOLON,';',1,1640) +LexToken(EOL,'\n',1,1641) +LexToken(VAR,'model',1,1650) +LexToken(DOT,'.',1,1655) +LexToken(VAR,'rpar',1,1656) +LexToken(ASSIGNMENT,'=',1,1660) +LexToken(VAR,'scs',1,1661) +LexToken(SEMICOLON,';',1,1664) +LexToken(EOL,'\n',1,1665) +LexToken(VAR,'model',1,1674) +LexToken(DOT,'.',1,1679) +LexToken(VAR,'blocktype',1,1680) +LexToken(ASSIGNMENT,'=',1,1689) +LexToken(DQSTRING,'"h"',1,1692) +LexToken(SEMICOLON,';',1,1693) +LexToken(EOL,'\n',1,1694) +LexToken(VAR,'model',1,1703) +LexToken(DOT,'.',1,1708) +LexToken(VAR,'dep_ut',1,1709) +LexToken(ASSIGNMENT,'=',1,1715) +LexToken(OPENSQBRACKET,'[',1,1716) +LexToken(PREVAR_BOOLEAN,'%f',1,1717) +LexToken(PREVAR_BOOLEAN,'%f',1,1720) +LexToken(CLOSESQBRACKET,']',1,1722) +LexToken(SEMICOLON,';',1,1723) LexToken(EOL,'\n',1,1724) -LexToken(VAR,'gr_i',1,1733) -LexToken(ASSIGNMENT,'=',1,1737) -LexToken(OPENSQBRACKET,'[',1,1738) -LexToken(CLOSESQBRACKET,']',1,1739) -LexToken(EOL,'\n',1,1740) -LexToken(VAR,'x',1,1749) -LexToken(ASSIGNMENT,'=',1,1750) -LexToken(VAR,'standard_define',1,1751) -LexToken(OPENBRACKET,'(',1,1766) -LexToken(OPENSQBRACKET,'[',1,1767) -LexToken(NUMBER,'2',1,1768) -LexToken(NUMBER,'2',1,1770) -LexToken(CLOSESQBRACKET,']',1,1771) -LexToken(COMMA,',',1,1772) -LexToken(VAR,'model',1,1773) -LexToken(COMMA,',',1,1778) -LexToken(OPENSQBRACKET,'[',1,1779) -LexToken(CLOSESQBRACKET,']',1,1780) -LexToken(COMMA,',',1,1781) -LexToken(VAR,'gr_i',1,1782) -LexToken(CLOSEBRACKET,')',1,1786) -LexToken(EOL,'\n',1,1787) -LexToken(END,'end',1,1792) -LexToken(EOL,'\n',1,1795) -LexToken(ENDFUNCTION,'endfunction',1,1796) -LexToken(EOL,'\n',1,1807) +LexToken(EOL,'\n',1,1725) +LexToken(VAR,'gr_i',1,1734) +LexToken(ASSIGNMENT,'=',1,1738) +LexToken(OPENSQBRACKET,'[',1,1739) +LexToken(CLOSESQBRACKET,']',1,1740) +LexToken(EOL,'\n',1,1741) +LexToken(VAR,'x',1,1750) +LexToken(ASSIGNMENT,'=',1,1751) +LexToken(VAR,'standard_define',1,1752) +LexToken(OPENBRACKET,'(',1,1767) +LexToken(OPENSQBRACKET,'[',1,1768) +LexToken(NUMBER,'2',1,1769) +LexToken(NUMBER,'2',1,1771) +LexToken(CLOSESQBRACKET,']',1,1772) +LexToken(COMMA,',',1,1773) +LexToken(VAR,'model',1,1774) +LexToken(COMMA,',',1,1779) +LexToken(OPENSQBRACKET,'[',1,1780) +LexToken(CLOSESQBRACKET,']',1,1781) +LexToken(COMMA,',',1,1782) +LexToken(VAR,'gr_i',1,1783) +LexToken(CLOSEBRACKET,')',1,1787) +LexToken(EOL,'\n',1,1788) +LexToken(END,'end',1,1793) +LexToken(EOL,'\n',1,1796) +LexToken(ENDFUNCTION,'endfunction',1,1797) +LexToken(EOL,'\n',1,1808) diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 84b66f25..abde7f39 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -155,7 +155,8 @@ LexToken(VAR,'list',1,1475) LexToken(OPENBRACKET,'(',1,1479) LexToken(DQSTRING,'"str"',1,1484) LexToken(COMMA,',',1,1485) -LexToken(NUMBER,'-1',1,1486) +LexToken(ADDITION,'-',1,1486) +LexToken(NUMBER,'1',1,1487) LexToken(COMMA,',',1,1488) LexToken(DQSTRING,'"vec"',1,1493) LexToken(COMMA,',',1,1494) diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index d9ef11c9..a1924991 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -124,19 +124,23 @@ LexToken(VAR,'list',1,1318) LexToken(OPENBRACKET,'(',1,1322) LexToken(DQSTRING,'"vec"',1,1327) LexToken(COMMA,',',1,1328) -LexToken(NUMBER,'-1',1,1329) +LexToken(ADDITION,'-',1,1329) +LexToken(NUMBER,'1',1,1330) LexToken(COMMA,',',1,1331) LexToken(DQSTRING,'"vec"',1,1336) LexToken(COMMA,',',1,1337) -LexToken(NUMBER,'-1',1,1338) +LexToken(ADDITION,'-',1,1338) +LexToken(NUMBER,'1',1,1339) LexToken(COMMA,',',1,1340) LexToken(DQSTRING,'"vec"',1,1345) LexToken(COMMA,',',1,1346) -LexToken(NUMBER,'-1',1,1347) +LexToken(ADDITION,'-',1,1347) +LexToken(NUMBER,'1',1,1348) LexToken(COMMA,',',1,1349) LexToken(DQSTRING,'"str"',1,1354) LexToken(COMMA,',',1,1355) -LexToken(NUMBER,'-1',1,1356) +LexToken(ADDITION,'-',1,1356) +LexToken(NUMBER,'1',1,1357) LexToken(CLOSEBRACKET,')',1,1358) LexToken(COMMA,',',1,1359) LexToken(VAR,'label',1,1360) diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 74144f65..82063edd 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -125,19 +125,23 @@ LexToken(VAR,'list',1,1331) LexToken(OPENBRACKET,'(',1,1335) LexToken(DQSTRING,'"vec"',1,1340) LexToken(COMMA,',',1,1341) -LexToken(NUMBER,'-1',1,1342) +LexToken(ADDITION,'-',1,1342) +LexToken(NUMBER,'1',1,1343) LexToken(COMMA,',',1,1344) LexToken(DQSTRING,'"vec"',1,1349) LexToken(COMMA,',',1,1350) -LexToken(NUMBER,'-1',1,1351) +LexToken(ADDITION,'-',1,1351) +LexToken(NUMBER,'1',1,1352) LexToken(COMMA,',',1,1353) LexToken(DQSTRING,'"vec"',1,1358) LexToken(COMMA,',',1,1359) -LexToken(NUMBER,'-1',1,1360) +LexToken(ADDITION,'-',1,1360) +LexToken(NUMBER,'1',1,1361) LexToken(COMMA,',',1,1362) LexToken(DQSTRING,'"str"',1,1367) LexToken(COMMA,',',1,1368) -LexToken(NUMBER,'-1',1,1369) +LexToken(ADDITION,'-',1,1369) +LexToken(NUMBER,'1',1,1370) LexToken(CLOSEBRACKET,')',1,1371) LexToken(COMMA,',',1,1372) LexToken(VAR,'label',1,1373) diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 6c891573..e3f59710 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -189,35 +189,43 @@ LexToken(NUMBER,'1',1,1865) LexToken(COMMA,',',1,1866) LexToken(DQSTRING,'"vec"',1,1871) LexToken(COMMA,',',1,1872) -LexToken(NUMBER,'-1',1,1873) +LexToken(ADDITION,'-',1,1873) +LexToken(NUMBER,'1',1,1874) LexToken(COMMA,',',1,1875) LexToken(DQSTRING,'"vec"',1,1880) LexToken(COMMA,',',1,1881) -LexToken(NUMBER,'-1',1,1882) +LexToken(ADDITION,'-',1,1882) +LexToken(NUMBER,'1',1,1883) LexToken(COMMA,',',1,1884) LexToken(DQSTRING,'"vec"',1,1889) LexToken(COMMA,',',1,1890) -LexToken(NUMBER,'-1',1,1891) +LexToken(ADDITION,'-',1,1891) +LexToken(NUMBER,'1',1,1892) LexToken(COMMA,',',1,1893) LexToken(DQSTRING,'"vec"',1,1898) LexToken(COMMA,',',1,1899) -LexToken(NUMBER,'-1',1,1900) +LexToken(ADDITION,'-',1,1900) +LexToken(NUMBER,'1',1,1901) LexToken(COMMA,',',1,1902) LexToken(DQSTRING,'"vec"',1,1922) LexToken(COMMA,',',1,1923) -LexToken(NUMBER,'-1',1,1924) +LexToken(ADDITION,'-',1,1924) +LexToken(NUMBER,'1',1,1925) LexToken(COMMA,',',1,1926) LexToken(DQSTRING,'"vec"',1,1931) LexToken(COMMA,',',1,1932) -LexToken(NUMBER,'-1',1,1933) +LexToken(ADDITION,'-',1,1933) +LexToken(NUMBER,'1',1,1934) LexToken(COMMA,',',1,1935) LexToken(DQSTRING,'"vec"',1,1940) LexToken(COMMA,',',1,1941) -LexToken(NUMBER,'-1',1,1942) +LexToken(ADDITION,'-',1,1942) +LexToken(NUMBER,'1',1,1943) LexToken(COMMA,',',1,1944) LexToken(DQSTRING,'"vec"',1,1949) LexToken(COMMA,',',1,1950) -LexToken(NUMBER,'-1',1,1951) +LexToken(ADDITION,'-',1,1951) +LexToken(NUMBER,'1',1,1952) LexToken(COMMA,',',1,1953) LexToken(DQSTRING,'"vec"',1,1958) LexToken(COMMA,',',1,1959) diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 4fb08fef..599a42d6 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -197,35 +197,43 @@ LexToken(NUMBER,'1',1,1948) LexToken(COMMA,',',1,1949) LexToken(DQSTRING,'"vec"',1,1954) LexToken(COMMA,',',1,1955) -LexToken(NUMBER,'-1',1,1956) +LexToken(ADDITION,'-',1,1956) +LexToken(NUMBER,'1',1,1957) LexToken(COMMA,',',1,1958) LexToken(DQSTRING,'"vec"',1,1963) LexToken(COMMA,',',1,1964) -LexToken(NUMBER,'-1',1,1965) +LexToken(ADDITION,'-',1,1965) +LexToken(NUMBER,'1',1,1966) LexToken(COMMA,',',1,1967) LexToken(DQSTRING,'"vec"',1,1972) LexToken(COMMA,',',1,1973) -LexToken(NUMBER,'-1',1,1974) +LexToken(ADDITION,'-',1,1974) +LexToken(NUMBER,'1',1,1975) LexToken(COMMA,',',1,1976) LexToken(DQSTRING,'"vec"',1,1981) LexToken(COMMA,',',1,1982) -LexToken(NUMBER,'-1',1,1983) +LexToken(ADDITION,'-',1,1983) +LexToken(NUMBER,'1',1,1984) LexToken(COMMA,',',1,1985) LexToken(DQSTRING,'"vec"',1,2005) LexToken(COMMA,',',1,2006) -LexToken(NUMBER,'-1',1,2007) +LexToken(ADDITION,'-',1,2007) +LexToken(NUMBER,'1',1,2008) LexToken(COMMA,',',1,2009) LexToken(DQSTRING,'"vec"',1,2014) LexToken(COMMA,',',1,2015) -LexToken(NUMBER,'-1',1,2016) +LexToken(ADDITION,'-',1,2016) +LexToken(NUMBER,'1',1,2017) LexToken(COMMA,',',1,2018) LexToken(DQSTRING,'"vec"',1,2023) LexToken(COMMA,',',1,2024) -LexToken(NUMBER,'-1',1,2025) +LexToken(ADDITION,'-',1,2025) +LexToken(NUMBER,'1',1,2026) LexToken(COMMA,',',1,2027) LexToken(DQSTRING,'"vec"',1,2032) LexToken(COMMA,',',1,2033) -LexToken(NUMBER,'-1',1,2034) +LexToken(ADDITION,'-',1,2034) +LexToken(NUMBER,'1',1,2035) LexToken(COMMA,',',1,2036) LexToken(DQSTRING,'"vec"',1,2041) LexToken(COMMA,',',1,2042) diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 8145a32d..1209925d 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -214,56 +214,68 @@ LexToken(COMMA,',',1,2121) LexToken(DQSTRING,'"mat"',1,2126) LexToken(COMMA,',',1,2127) LexToken(OPENSQBRACKET,'[',1,2128) -LexToken(NUMBER,'-1',1,2129) +LexToken(ADDITION,'-',1,2129) +LexToken(NUMBER,'1',1,2130) LexToken(NUMBER,'2',1,2132) LexToken(CLOSESQBRACKET,']',1,2133) LexToken(COMMA,',',1,2134) LexToken(DQSTRING,'"vec"',1,2139) LexToken(COMMA,',',1,2140) -LexToken(NUMBER,'-1',1,2141) +LexToken(ADDITION,'-',1,2141) +LexToken(NUMBER,'1',1,2142) LexToken(COMMA,',',1,2143) LexToken(DQSTRING,'"mat"',1,2148) LexToken(COMMA,',',1,2149) LexToken(OPENSQBRACKET,'[',1,2150) -LexToken(NUMBER,'-1',1,2151) +LexToken(ADDITION,'-',1,2151) +LexToken(NUMBER,'1',1,2152) LexToken(NUMBER,'2',1,2154) LexToken(CLOSESQBRACKET,']',1,2155) LexToken(COMMA,',',1,2156) LexToken(DQSTRING,'"vec"',1,2161) LexToken(COMMA,',',1,2162) -LexToken(NUMBER,'-1',1,2163) +LexToken(ADDITION,'-',1,2163) +LexToken(NUMBER,'1',1,2164) LexToken(COMMA,',',1,2165) LexToken(DQSTRING,'"vec"',1,2170) LexToken(COMMA,',',1,2171) -LexToken(NUMBER,'-1',1,2172) +LexToken(ADDITION,'-',1,2172) +LexToken(NUMBER,'1',1,2173) LexToken(COMMA,',',1,2174) LexToken(DQSTRING,'"vec"',1,2179) LexToken(COMMA,',',1,2180) -LexToken(NUMBER,'-1',1,2181) +LexToken(ADDITION,'-',1,2181) +LexToken(NUMBER,'1',1,2182) LexToken(COMMA,',',1,2183) LexToken(DQSTRING,'"vec"',1,2203) LexToken(COMMA,',',1,2204) -LexToken(NUMBER,'-1',1,2205) +LexToken(ADDITION,'-',1,2205) +LexToken(NUMBER,'1',1,2206) LexToken(COMMA,',',1,2207) LexToken(DQSTRING,'"vec"',1,2212) LexToken(COMMA,',',1,2213) -LexToken(NUMBER,'-1',1,2214) +LexToken(ADDITION,'-',1,2214) +LexToken(NUMBER,'1',1,2215) LexToken(COMMA,',',1,2216) LexToken(DQSTRING,'"lis"',1,2221) LexToken(COMMA,',',1,2222) -LexToken(NUMBER,'-1',1,2223) +LexToken(ADDITION,'-',1,2223) +LexToken(NUMBER,'1',1,2224) LexToken(COMMA,',',1,2225) LexToken(DQSTRING,'"vec"',1,2230) LexToken(COMMA,',',1,2231) -LexToken(NUMBER,'-1',1,2232) +LexToken(ADDITION,'-',1,2232) +LexToken(NUMBER,'1',1,2233) LexToken(COMMA,',',1,2234) LexToken(DQSTRING,'"vec"',1,2239) LexToken(COMMA,',',1,2240) -LexToken(NUMBER,'-1',1,2241) +LexToken(ADDITION,'-',1,2241) +LexToken(NUMBER,'1',1,2242) LexToken(COMMA,',',1,2243) LexToken(DQSTRING,'"lis"',1,2248) LexToken(COMMA,',',1,2249) -LexToken(NUMBER,'-1',1,2250) +LexToken(ADDITION,'-',1,2250) +LexToken(NUMBER,'1',1,2251) LexToken(COMMA,',',1,2252) LexToken(DQSTRING,'"vec"',1,2257) LexToken(COMMA,',',1,2258) diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index c7fa0a29..f30aa67c 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -208,31 +208,38 @@ LexToken(VAR,'list',1,3437) LexToken(OPENBRACKET,'(',1,3441) LexToken(DQSTRING,'"vec"',1,3446) LexToken(COMMA,',',1,3447) -LexToken(NUMBER,'-1',1,3448) +LexToken(ADDITION,'-',1,3448) +LexToken(NUMBER,'1',1,3449) LexToken(COMMA,',',1,3450) LexToken(DQSTRING,'"vec"',1,3455) LexToken(COMMA,',',1,3456) -LexToken(NUMBER,'-1',1,3457) +LexToken(ADDITION,'-',1,3457) +LexToken(NUMBER,'1',1,3458) LexToken(COMMA,',',1,3459) LexToken(DQSTRING,'"vec"',1,3464) LexToken(COMMA,',',1,3465) -LexToken(NUMBER,'-1',1,3466) +LexToken(ADDITION,'-',1,3466) +LexToken(NUMBER,'1',1,3467) LexToken(COMMA,',',1,3468) LexToken(DQSTRING,'"vec"',1,3473) LexToken(COMMA,',',1,3474) -LexToken(NUMBER,'-1',1,3475) +LexToken(ADDITION,'-',1,3475) +LexToken(NUMBER,'1',1,3476) LexToken(COMMA,',',1,3477) LexToken(DQSTRING,'"vec"',1,3482) LexToken(COMMA,',',1,3483) -LexToken(NUMBER,'-1',1,3484) +LexToken(ADDITION,'-',1,3484) +LexToken(NUMBER,'1',1,3485) LexToken(COMMA,',',1,3486) LexToken(DQSTRING,'"vec"',1,3491) LexToken(COMMA,',',1,3492) -LexToken(NUMBER,'-1',1,3493) +LexToken(ADDITION,'-',1,3493) +LexToken(NUMBER,'1',1,3494) LexToken(COMMA,',',1,3495) LexToken(DQSTRING,'"vec"',1,3515) LexToken(COMMA,',',1,3516) -LexToken(NUMBER,'-1',1,3517) +LexToken(ADDITION,'-',1,3517) +LexToken(NUMBER,'1',1,3518) LexToken(COMMA,',',1,3519) LexToken(DQSTRING,'"vec"',1,3524) LexToken(COMMA,',',1,3525) diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index b8bc54b2..45892b1b 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -160,40 +160,48 @@ LexToken(OPENBRACKET,'(',1,2044) LexToken(DQSTRING,'"mat"',1,2049) LexToken(COMMA,',',1,2050) LexToken(OPENSQBRACKET,'[',1,2051) -LexToken(NUMBER,'-1',1,2052) +LexToken(ADDITION,'-',1,2052) +LexToken(NUMBER,'1',1,2053) LexToken(NUMBER,'2',1,2055) LexToken(CLOSESQBRACKET,']',1,2056) LexToken(COMMA,',',1,2057) LexToken(DQSTRING,'"mat"',1,2062) LexToken(COMMA,',',1,2063) LexToken(OPENSQBRACKET,'[',1,2064) -LexToken(NUMBER,'-2',1,2065) +LexToken(ADDITION,'-',1,2065) +LexToken(NUMBER,'2',1,2066) LexToken(NUMBER,'2',1,2068) LexToken(CLOSESQBRACKET,']',1,2069) LexToken(COMMA,',',1,2070) LexToken(DQSTRING,'"vec"',1,2075) LexToken(COMMA,',',1,2076) -LexToken(NUMBER,'-1',1,2077) +LexToken(ADDITION,'-',1,2077) +LexToken(NUMBER,'1',1,2078) LexToken(COMMA,',',1,2079) LexToken(DQSTRING,'"vec"',1,2084) LexToken(COMMA,',',1,2085) -LexToken(NUMBER,'-1',1,2086) +LexToken(ADDITION,'-',1,2086) +LexToken(NUMBER,'1',1,2087) LexToken(COMMA,',',1,2088) LexToken(DQSTRING,'"vec"',1,2093) LexToken(COMMA,',',1,2094) -LexToken(NUMBER,'-1',1,2095) +LexToken(ADDITION,'-',1,2095) +LexToken(NUMBER,'1',1,2096) LexToken(COMMA,',',1,2097) LexToken(DQSTRING,'"vec"',1,2102) LexToken(COMMA,',',1,2103) -LexToken(NUMBER,'-1',1,2104) +LexToken(ADDITION,'-',1,2104) +LexToken(NUMBER,'1',1,2105) LexToken(COMMA,',',1,2106) LexToken(DQSTRING,'"vec"',1,2126) LexToken(COMMA,',',1,2127) -LexToken(NUMBER,'-1',1,2128) +LexToken(ADDITION,'-',1,2128) +LexToken(NUMBER,'1',1,2129) LexToken(COMMA,',',1,2130) LexToken(DQSTRING,'"vec"',1,2135) LexToken(COMMA,',',1,2136) -LexToken(NUMBER,'-1',1,2137) +LexToken(ADDITION,'-',1,2137) +LexToken(NUMBER,'1',1,2138) LexToken(COMMA,',',1,2139) LexToken(DQSTRING,'"vec"',1,2144) LexToken(COMMA,',',1,2145) |