From 1df154abb3a2be1de529b3c06701f8c7485de1d0 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 13 Jun 2018 13:05:27 +0530 Subject: add make rules for generating debug files --- js/Linear/BIGSOM_f.js | 17 +- js/Linear/CLR.js | 5 +- js/Linear/CLR_f.js | 5 +- js/Linear/CLSS.js | 23 +- js/Linear/CLSS_f.js | 15 +- js/Linear/DELAYV_f.js | 19 +- js/Linear/DELAY_f.js | 16 +- js/Linear/DERIV.js | 6 +- js/Linear/DIFF_c.js | 778 ++++++++++++++++++++++---------------------- js/Linear/DLR.js | 3 +- js/Linear/DLR_f.js | 3 +- js/Linear/DLSS.js | 23 +- js/Linear/DLSS_f.js | 15 +- js/Linear/DOLLAR.js | 13 +- js/Linear/DOLLAR_f.js | 16 +- js/Linear/DOLLAR_m.js | 13 +- js/Linear/GAINBLK.js | 38 ++- js/Linear/GAINBLK_f.js | 6 +- js/Linear/GAIN_f.js | 6 +- js/Linear/INTEGRAL.js | 18 +- js/Linear/INTEGRAL_m.js | 51 +-- js/Linear/PID.js | 135 +++++--- js/Linear/REGISTER.js | 3 +- js/Linear/REGISTER_f.js | 3 +- js/Linear/SAMPHOLD.js | 9 +- js/Linear/SAMPHOLD_m.js | 12 +- js/Linear/SAMPLEHOLD_f.js | 9 +- js/Linear/SOM_f.js | 14 +- js/Linear/SUMMATION.js | 52 +-- js/Linear/SUM_f.js | 12 +- js/Linear/TCLSS.js | 12 +- js/Linear/TCLSS_f.js | 12 +- js/Linear/TIME_DELAY.js | 6 +- js/Linear/VARIABLE_DELAY.js | 6 +- 34 files changed, 771 insertions(+), 603 deletions(-) (limited to 'js/Linear') diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 006bcbd0..ede8fc82 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -107,7 +107,8 @@ LexToken(VAR,'list',1,1175) LexToken(OPENBRACKET,'(',1,1179) LexToken(DQSTRING,'"vec"',1,1184) LexToken(COMMA,',',1,1185) -LexToken(NUMBER,'-1',1,1186) +LexToken(ADDITION,'-',1,1186) +LexToken(NUMBER,'1',1,1187) LexToken(CLOSEBRACKET,')',1,1188) LexToken(COMMA,',',1,1189) LexToken(VAR,'exprs',1,1190) @@ -125,7 +126,7 @@ LexToken(EOL,'\n',1,1258) LexToken(EOL,'\n',1,1259) LexToken(VAR,'in',1,1272) LexToken(ASSIGNMENT,'=',1,1275) -LexToken(OPERATOR,'-',1,1277) +LexToken(ADDITION,'-',1,1277) LexToken(VAR,'ones',1,1278) LexToken(OPENBRACKET,'(',1,1282) LexToken(VAR,'size',1,1283) @@ -156,7 +157,8 @@ LexToken(VAR,'graphics',1,1386) LexToken(COMMA,',',1,1394) LexToken(VAR,'in',1,1395) LexToken(COMMA,',',1,1397) -LexToken(NUMBER,'-1',1,1398) +LexToken(ADDITION,'-',1,1398) +LexToken(NUMBER,'1',1,1399) LexToken(COMMA,',',1,1400) LexToken(OPENSQBRACKET,'[',1,1401) LexToken(CLOSESQBRACKET,']',1,1402) @@ -243,16 +245,19 @@ LexToken(DOT,'.',1,1749) LexToken(VAR,'in',1,1750) LexToken(ASSIGNMENT,'=',1,1752) LexToken(OPENSQBRACKET,'[',1,1753) -LexToken(NUMBER,'-1',1,1754) +LexToken(ADDITION,'-',1,1754) +LexToken(NUMBER,'1',1,1755) LexToken(SEMICOLON,';',1,1756) -LexToken(NUMBER,'-1',1,1757) +LexToken(ADDITION,'-',1,1757) +LexToken(NUMBER,'1',1,1758) LexToken(CLOSESQBRACKET,']',1,1759) LexToken(EOL,'\n',1,1760) LexToken(VAR,'model',1,1769) LexToken(DOT,'.',1,1774) LexToken(VAR,'out',1,1775) LexToken(ASSIGNMENT,'=',1,1778) -LexToken(NUMBER,'-1',1,1779) +LexToken(ADDITION,'-',1,1779) +LexToken(NUMBER,'1',1,1780) LexToken(EOL,'\n',1,1781) LexToken(VAR,'model',1,1790) LexToken(DOT,'.',1,1795) diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index bb1fdd3e..f22ba6c4 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -257,7 +257,7 @@ LexToken(OPENBRACKET,'(',1,1899) LexToken(VAR,'A',1,1900) LexToken(COMMA,',',1,1901) LexToken(VAR,'ns1',1,1902) -LexToken(OPERATOR,'*',1,1905) +LexToken(MULTIPLICATION,'*',1,1905) LexToken(VAR,'ns1',1,1906) LexToken(COMMA,',',1,1909) LexToken(NUMBER,'1',1,1910) @@ -405,7 +405,8 @@ LexToken(SEMICOLON,';',1,2600) LexToken(EOL,'\n',1,2601) LexToken(VAR,'A',1,2610) LexToken(ASSIGNMENT,'=',1,2611) -LexToken(NUMBER,'-1',1,2612) +LexToken(ADDITION,'-',1,2612) +LexToken(NUMBER,'1',1,2613) LexToken(SEMICOLON,';',1,2614) LexToken(EOL,'\n',1,2615) LexToken(VAR,'B',1,2624) diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index fd84b5e2..f0970ed7 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -261,7 +261,7 @@ LexToken(OPENBRACKET,'(',1,1919) LexToken(VAR,'A',1,1920) LexToken(COMMA,',',1,1921) LexToken(VAR,'ns1',1,1922) -LexToken(OPERATOR,'*',1,1925) +LexToken(MULTIPLICATION,'*',1,1925) LexToken(VAR,'ns1',1,1926) LexToken(COMMA,',',1,1929) LexToken(NUMBER,'1',1,1930) @@ -409,7 +409,8 @@ LexToken(SEMICOLON,';',1,2620) LexToken(EOL,'\n',1,2621) LexToken(VAR,'A',1,2630) LexToken(ASSIGNMENT,'=',1,2631) -LexToken(NUMBER,'-1',1,2632) +LexToken(ADDITION,'-',1,2632) +LexToken(NUMBER,'1',1,2633) LexToken(SEMICOLON,';',1,2634) LexToken(EOL,'\n',1,2635) LexToken(VAR,'B',1,2644) diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 4fcd397b..470ff379 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -153,9 +153,11 @@ LexToken(OPENBRACKET,'(',1,1398) LexToken(DQSTRING,'"mat"',1,1403) LexToken(COMMA,',',1,1404) LexToken(OPENSQBRACKET,'[',1,1405) -LexToken(NUMBER,'-1',1,1406) +LexToken(ADDITION,'-',1,1406) +LexToken(NUMBER,'1',1,1407) LexToken(COMMA,',',1,1408) -LexToken(NUMBER,'-1',1,1409) +LexToken(ADDITION,'-',1,1409) +LexToken(NUMBER,'1',1,1410) LexToken(CLOSESQBRACKET,']',1,1411) LexToken(COMMA,',',1,1412) LexToken(DQSTRING,'"mat"',1,1432) @@ -177,8 +179,10 @@ LexToken(COMMA,',',1,1494) LexToken(DQSTRING,'"mat"',1,1514) LexToken(COMMA,',',1,1515) LexToken(OPENSQBRACKET,'[',1,1516) -LexToken(NUMBER,'-1',1,1517) -LexToken(NUMBER,'-1',1,1520) +LexToken(ADDITION,'-',1,1517) +LexToken(NUMBER,'1',1,1518) +LexToken(ADDITION,'-',1,1520) +LexToken(NUMBER,'1',1,1521) LexToken(CLOSESQBRACKET,']',1,1522) LexToken(COMMA,',',1,1523) LexToken(DQSTRING,'"vec"',1,1543) @@ -276,7 +280,7 @@ LexToken(VAR,'C',1,1909) LexToken(COMMA,',',1,1910) LexToken(NUMBER,'1',1,1911) LexToken(CLOSEBRACKET,')',1,1912) -LexToken(OPERATOR,'*',1,1913) +LexToken(MULTIPLICATION,'*',1,1913) LexToken(VAR,'size',1,1914) LexToken(OPENBRACKET,'(',1,1918) LexToken(VAR,'B',1,1919) @@ -299,11 +303,11 @@ LexToken(EOL,'\n',1,1967) LexToken(VAR,'D',1,1988) LexToken(ASSIGNMENT,'=',1,1990) LexToken(VAR,'D',1,1992) -LexToken(OPERATOR,'*',1,1993) +LexToken(MULTIPLICATION,'*',1,1993) LexToken(VAR,'ones',1,1994) LexToken(OPENBRACKET,'(',1,1998) LexToken(VAR,'C',1,1999) -LexToken(OPERATOR,'*',1,2000) +LexToken(MULTIPLICATION,'*',1,2000) LexToken(VAR,'B',1,2001) LexToken(CLOSEBRACKET,')',1,2002) LexToken(SEMICOLON,';',1,2004) @@ -324,7 +328,7 @@ LexToken(ASSIGNMENT,'=',1,2072) LexToken(VAR,'zeros',1,2074) LexToken(OPENBRACKET,'(',1,2079) LexToken(VAR,'C',1,2080) -LexToken(OPERATOR,'*',1,2081) +LexToken(MULTIPLICATION,'*',1,2081) LexToken(VAR,'B',1,2082) LexToken(CLOSEBRACKET,')',1,2083) LexToken(SEMICOLON,';',1,2085) @@ -540,7 +544,8 @@ LexToken(SEMICOLON,';',1,3193) LexToken(EOL,'\n',1,3194) LexToken(VAR,'A',1,3203) LexToken(ASSIGNMENT,'=',1,3204) -LexToken(NUMBER,'-1',1,3205) +LexToken(ADDITION,'-',1,3205) +LexToken(NUMBER,'1',1,3206) LexToken(SEMICOLON,';',1,3207) LexToken(EOL,'\n',1,3208) LexToken(VAR,'B',1,3217) diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 6634b3af..afdd35a2 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -153,9 +153,11 @@ LexToken(OPENBRACKET,'(',1,1400) LexToken(DQSTRING,'"mat"',1,1405) LexToken(COMMA,',',1,1406) LexToken(OPENSQBRACKET,'[',1,1407) -LexToken(NUMBER,'-1',1,1408) +LexToken(ADDITION,'-',1,1408) +LexToken(NUMBER,'1',1,1409) LexToken(COMMA,',',1,1410) -LexToken(NUMBER,'-1',1,1411) +LexToken(ADDITION,'-',1,1411) +LexToken(NUMBER,'1',1,1412) LexToken(CLOSESQBRACKET,']',1,1413) LexToken(COMMA,',',1,1414) LexToken(DQSTRING,'"mat"',1,1434) @@ -177,8 +179,10 @@ LexToken(COMMA,',',1,1496) LexToken(DQSTRING,'"mat"',1,1516) LexToken(COMMA,',',1,1517) LexToken(OPENSQBRACKET,'[',1,1518) -LexToken(NUMBER,'-1',1,1519) -LexToken(NUMBER,'-1',1,1522) +LexToken(ADDITION,'-',1,1519) +LexToken(NUMBER,'1',1,1520) +LexToken(ADDITION,'-',1,1522) +LexToken(NUMBER,'1',1,1523) LexToken(CLOSESQBRACKET,']',1,1524) LexToken(COMMA,',',1,1525) LexToken(DQSTRING,'"vec"',1,1545) @@ -452,7 +456,8 @@ LexToken(SEMICOLON,';',1,2845) LexToken(EOL,'\n',1,2846) LexToken(VAR,'A',1,2855) LexToken(ASSIGNMENT,'=',1,2856) -LexToken(NUMBER,'-1',1,2857) +LexToken(ADDITION,'-',1,2857) +LexToken(NUMBER,'1',1,2858) LexToken(SEMICOLON,';',1,2859) LexToken(EOL,'\n',1,2860) LexToken(VAR,'B',1,2869) diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 49102751..5750e0a0 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -110,7 +110,8 @@ LexToken(OPENBRACKET,'(',1,1109) LexToken(NUMBER,'1',1,1110) LexToken(COLON,':',1,1111) LexToken(LASTINDEX,'$',1,1112) -LexToken(NUMBER,'-1',1,1113) +LexToken(ADDITION,'-',1,1113) +LexToken(NUMBER,'1',1,1114) LexToken(CLOSEBRACKET,')',1,1115) LexToken(SEMICOLON,';',1,1116) LexToken(EOL,'\n',1,1117) @@ -159,7 +160,8 @@ LexToken(NUMBER,'1',1,1360) LexToken(COMMA,',',1,1361) LexToken(DQSTRING,'"vec"',1,1366) LexToken(COMMA,',',1,1367) -LexToken(NUMBER,'-1',1,1368) +LexToken(ADDITION,'-',1,1368) +LexToken(NUMBER,'1',1,1369) LexToken(COMMA,',',1,1370) LexToken(DQSTRING,'"vec"',1,1375) LexToken(COMMA,',',1,1376) @@ -287,7 +289,7 @@ LexToken(DOT,'.',1,1962) LexToken(VAR,'rpar',1,1963) LexToken(ASSIGNMENT,'=',1,1967) LexToken(VAR,'T',1,1968) -LexToken(OPERATOR,'/',1,1969) +LexToken(MULTIPLICATION,'/',1,1969) LexToken(OPENBRACKET,'(',1,1970) LexToken(VAR,'size',1,1971) LexToken(OPENBRACKET,'(',1,1975) @@ -342,7 +344,8 @@ LexToken(OPENBRACKET,'(',1,2179) LexToken(NUMBER,'1',1,2180) LexToken(COLON,':',1,2181) LexToken(LASTINDEX,'$',1,2182) -LexToken(NUMBER,'-1',1,2183) +LexToken(ADDITION,'-',1,2183) +LexToken(NUMBER,'1',1,2184) LexToken(CLOSEBRACKET,')',1,2185) LexToken(EOL,'\n',1,2186) LexToken(VAR,'T',1,2195) @@ -410,7 +413,7 @@ LexToken(DOT,'.',1,2397) LexToken(VAR,'rpar',1,2398) LexToken(ASSIGNMENT,'=',1,2402) LexToken(VAR,'T',1,2403) -LexToken(OPERATOR,'/',1,2404) +LexToken(MULTIPLICATION,'/',1,2404) LexToken(OPENBRACKET,'(',1,2405) LexToken(VAR,'size',1,2406) LexToken(OPENBRACKET,'(',1,2410) @@ -432,7 +435,8 @@ LexToken(VAR,'firing',1,2463) LexToken(ASSIGNMENT,'=',1,2469) LexToken(OPENSQBRACKET,'[',1,2470) LexToken(NUMBER,'0',1,2471) -LexToken(NUMBER,'-1',1,2473) +LexToken(ADDITION,'-',1,2473) +LexToken(NUMBER,'1',1,2474) LexToken(CLOSESQBRACKET,']',1,2475) LexToken(EOL,'\n',1,2476) LexToken(VAR,'model',1,2485) @@ -462,7 +466,8 @@ LexToken(OPENBRACKET,'(',1,2550) LexToken(NUMBER,'1',1,2551) LexToken(COLON,':',1,2552) LexToken(LASTINDEX,'$',1,2553) -LexToken(NUMBER,'-1',1,2554) +LexToken(ADDITION,'-',1,2554) +LexToken(NUMBER,'1',1,2555) LexToken(CLOSEBRACKET,')',1,2556) LexToken(CLOSEBRACKET,')',1,2557) LexToken(COMMA,',',1,2558) diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 79877644..76d2f806 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -289,7 +289,8 @@ LexToken(NUMBER,'1',1,2222) LexToken(COMMA,',',1,2223) LexToken(DQSTRING,'"vec"',1,2228) LexToken(COMMA,',',1,2229) -LexToken(NUMBER,'-1',1,2230) +LexToken(ADDITION,'-',1,2230) +LexToken(NUMBER,'1',1,2231) LexToken(CLOSEBRACKET,')',1,2232) LexToken(COMMA,',',1,2233) LexToken(VAR,'exprs',1,2234) @@ -412,7 +413,7 @@ LexToken(EOL,'\n',1,2955) LexToken(VAR,'newpar',1,2976) LexToken(OPENBRACKET,'(',1,2982) LexToken(LASTINDEX,'$',1,2983) -LexToken(OPERATOR,'+',1,2984) +LexToken(ADDITION,'+',1,2984) LexToken(NUMBER,'1',1,2985) LexToken(CLOSEBRACKET,')',1,2986) LexToken(ASSIGNMENT,'=',1,2987) @@ -482,7 +483,7 @@ LexToken(EOL,'\n',1,3309) LexToken(VAR,'newpar',1,3330) LexToken(OPENBRACKET,'(',1,3336) LexToken(LASTINDEX,'$',1,3337) -LexToken(OPERATOR,'+',1,3338) +LexToken(ADDITION,'+',1,3338) LexToken(NUMBER,'1',1,3339) LexToken(CLOSEBRACKET,')',1,3340) LexToken(ASSIGNMENT,'=',1,3341) @@ -1021,7 +1022,8 @@ LexToken(ASSIGNMENT,'=',1,5303) LexToken(OPENSQBRACKET,'[',1,5304) LexToken(NUMBER,'5',1,5305) LexToken(COMMA,',',1,5306) -LexToken(NUMBER,'-1',1,5307) +LexToken(ADDITION,'-',1,5307) +LexToken(NUMBER,'1',1,5308) LexToken(CLOSESQBRACKET,']',1,5309) LexToken(COMMA,',',1,5310) LexToken(VAR,'from',1,5322) @@ -1080,7 +1082,8 @@ LexToken(ASSIGNMENT,'=',1,5441) LexToken(OPENSQBRACKET,'[',1,5442) LexToken(NUMBER,'5',1,5443) LexToken(COMMA,',',1,5444) -LexToken(NUMBER,'-1',1,5445) +LexToken(ADDITION,'-',1,5445) +LexToken(NUMBER,'1',1,5446) LexToken(CLOSESQBRACKET,']',1,5447) LexToken(COMMA,',',1,5448) LexToken(VAR,'from',1,5460) @@ -1142,7 +1145,8 @@ LexToken(ASSIGNMENT,'=',1,5602) LexToken(OPENSQBRACKET,'[',1,5603) LexToken(NUMBER,'5',1,5604) LexToken(COMMA,',',1,5605) -LexToken(NUMBER,'-1',1,5606) +LexToken(ADDITION,'-',1,5606) +LexToken(NUMBER,'1',1,5607) LexToken(CLOSESQBRACKET,']',1,5608) LexToken(COMMA,',',1,5609) LexToken(VAR,'from',1,5610) diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 80575425..65ecfffc 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -91,13 +91,15 @@ LexToken(VAR,'model',1,1051) LexToken(DOT,'.',1,1056) LexToken(VAR,'in',1,1057) LexToken(ASSIGNMENT,'=',1,1059) -LexToken(NUMBER,'-1',1,1060) +LexToken(ADDITION,'-',1,1060) +LexToken(NUMBER,'1',1,1061) LexToken(EOL,'\n',1,1062) LexToken(VAR,'model',1,1071) LexToken(DOT,'.',1,1076) LexToken(VAR,'out',1,1077) LexToken(ASSIGNMENT,'=',1,1080) -LexToken(NUMBER,'-1',1,1081) +LexToken(ADDITION,'-',1,1081) +LexToken(NUMBER,'1',1,1082) LexToken(EOL,'\n',1,1083) LexToken(VAR,'model',1,1092) LexToken(DOT,'.',1,1097) diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index fa31c204..975c6792 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -2,398 +2,400 @@ LexToken(EOL,'\n',1,10) LexToken(EOL,'\n',1,13) LexToken(EOL,'\n',1,80) LexToken(EOL,'\n',1,139) -LexToken(EOL,'\n',1,192) -LexToken(EOL,'\n',1,195) -LexToken(EOL,'\n',1,267) -LexToken(EOL,'\n',1,339) -LexToken(EOL,'\n',1,408) -LexToken(EOL,'\n',1,447) -LexToken(EOL,'\n',1,450) -LexToken(EOL,'\n',1,517) -LexToken(EOL,'\n',1,583) -LexToken(EOL,'\n',1,648) -LexToken(EOL,'\n',1,696) -LexToken(EOL,'\n',1,699) -LexToken(EOL,'\n',1,768) -LexToken(EOL,'\n',1,831) -LexToken(EOL,'\n',1,913) -LexToken(EOL,'\n',1,916) -LexToken(EOL,'\n',1,947) -LexToken(EOL,'\n',1,950) +LexToken(EOL,'\n',1,193) +LexToken(EOL,'\n',1,196) +LexToken(EOL,'\n',1,268) +LexToken(EOL,'\n',1,340) +LexToken(EOL,'\n',1,409) +LexToken(EOL,'\n',1,448) +LexToken(EOL,'\n',1,451) +LexToken(EOL,'\n',1,518) +LexToken(EOL,'\n',1,584) +LexToken(EOL,'\n',1,649) +LexToken(EOL,'\n',1,697) +LexToken(EOL,'\n',1,700) +LexToken(EOL,'\n',1,769) +LexToken(EOL,'\n',1,832) +LexToken(EOL,'\n',1,914) +LexToken(EOL,'\n',1,917) +LexToken(EOL,'\n',1,948) LexToken(EOL,'\n',1,951) -LexToken(FUNCTION,'function',1,952) -LexToken(OPENSQBRACKET,'[',1,961) -LexToken(VAR,'x',1,962) -LexToken(COMMA,',',1,963) -LexToken(VAR,'y',1,964) -LexToken(COMMA,',',1,965) -LexToken(VAR,'typ',1,966) -LexToken(CLOSESQBRACKET,']',1,969) -LexToken(ASSIGNMENT,'=',1,970) -LexToken(VAR,'DIFF_c',1,971) -LexToken(OPENBRACKET,'(',1,977) -LexToken(VAR,'job',1,978) -LexToken(COMMA,',',1,981) -LexToken(VAR,'arg1',1,982) -LexToken(COMMA,',',1,986) -LexToken(VAR,'arg2',1,987) -LexToken(CLOSEBRACKET,')',1,991) -LexToken(EOL,'\n',1,992) -LexToken(EOL,'\n',1,1015) -LexToken(VAR,'x',1,1020) -LexToken(ASSIGNMENT,'=',1,1021) -LexToken(OPENSQBRACKET,'[',1,1022) -LexToken(CLOSESQBRACKET,']',1,1023) -LexToken(SEMICOLON,';',1,1024) -LexToken(EOL,'\n',1,1025) -LexToken(VAR,'y',1,1030) -LexToken(ASSIGNMENT,'=',1,1031) -LexToken(OPENSQBRACKET,'[',1,1032) -LexToken(CLOSESQBRACKET,']',1,1033) -LexToken(SEMICOLON,';',1,1034) -LexToken(EOL,'\n',1,1035) -LexToken(VAR,'typ',1,1040) -LexToken(ASSIGNMENT,'=',1,1043) -LexToken(OPENSQBRACKET,'[',1,1044) -LexToken(CLOSESQBRACKET,']',1,1045) -LexToken(SEMICOLON,';',1,1046) -LexToken(EOL,'\n',1,1047) -LexToken(SELECT,'select',1,1052) -LexToken(VAR,'job',1,1059) -LexToken(EOL,'\n',1,1062) -LexToken(CASE,'case',1,1067) -LexToken(DQSTRING,'"set"',1,1076) -LexToken(THEN,'then',1,1078) -LexToken(EOL,'\n',1,1082) -LexToken(VAR,'x',1,1091) -LexToken(ASSIGNMENT,'=',1,1092) -LexToken(VAR,'arg1',1,1093) -LexToken(EOL,'\n',1,1097) -LexToken(VAR,'graphics',1,1106) -LexToken(ASSIGNMENT,'=',1,1114) -LexToken(VAR,'arg1',1,1115) -LexToken(DOT,'.',1,1119) -LexToken(VAR,'graphics',1,1120) -LexToken(SEMICOLON,';',1,1128) -LexToken(EOL,'\n',1,1129) -LexToken(VAR,'exprs',1,1138) -LexToken(ASSIGNMENT,'=',1,1143) -LexToken(VAR,'graphics',1,1144) -LexToken(DOT,'.',1,1152) -LexToken(VAR,'exprs',1,1153) -LexToken(EOL,'\n',1,1158) -LexToken(VAR,'model',1,1167) -LexToken(ASSIGNMENT,'=',1,1172) -LexToken(VAR,'arg1',1,1173) -LexToken(DOT,'.',1,1177) -LexToken(VAR,'model',1,1178) -LexToken(SEMICOLON,';',1,1183) -LexToken(EOL,'\n',1,1184) -LexToken(WHILE,'while',1,1193) -LexToken(PREVAR_BOOLEAN,'%t',1,1199) -LexToken(DO,'do',1,1202) -LexToken(EOL,'\n',1,1204) -LexToken(VAR,'ask_again',1,1217) -LexToken(ASSIGNMENT,'=',1,1226) -LexToken(PREVAR_BOOLEAN,'%f',1,1227) -LexToken(EOL,'\n',1,1229) -LexToken(OPENSQBRACKET,'[',1,1242) -LexToken(VAR,'ok',1,1243) -LexToken(COMMA,',',1,1245) -LexToken(VAR,'x0',1,1246) -LexToken(COMMA,',',1,1248) -LexToken(VAR,'xd0',1,1249) -LexToken(COMMA,',',1,1252) -LexToken(VAR,'exprs',1,1253) -LexToken(CLOSESQBRACKET,']',1,1258) -LexToken(ASSIGNMENT,'=',1,1259) -LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1260) -LexToken(OPENBRACKET,'(',1,1275) -LexToken(DQSTRING,'"Set continuous linear system parameters"',1,1316) -LexToken(COMMA,',',1,1317) -LexToken(OPENSQBRACKET,'[',1,1333) -LexToken(DQSTRING,'"Initial state"',1,1348) -LexToken(SEMICOLON,';',1,1349) -LexToken(DQSTRING,'"Initial Derivative"',1,1369) -LexToken(CLOSESQBRACKET,']',1,1370) -LexToken(COMMA,',',1,1371) -LexToken(VAR,'list',1,1372) -LexToken(OPENBRACKET,'(',1,1376) -LexToken(DQSTRING,'"vec"',1,1381) -LexToken(COMMA,',',1,1382) -LexToken(NUMBER,'-1',1,1383) -LexToken(COMMA,',',1,1385) -LexToken(DQSTRING,'"vec"',1,1390) -LexToken(COMMA,',',1,1391) -LexToken(NUMBER,'-1',1,1392) -LexToken(CLOSEBRACKET,')',1,1394) -LexToken(COMMA,',',1,1395) -LexToken(VAR,'exprs',1,1396) -LexToken(CLOSEBRACKET,')',1,1401) -LexToken(EOL,'\n',1,1402) -LexToken(IF,'if',1,1415) -LexToken(NOT,'~',1,1418) -LexToken(VAR,'ok',1,1419) -LexToken(THEN,'then',1,1422) -LexToken(EOL,'\n',1,1426) -LexToken(BREAK,'break',1,1443) -LexToken(COMMA,',',1,1448) -LexToken(EOL,'\n',1,1449) -LexToken(END,'end',1,1462) -LexToken(EOL,'\n',1,1465) -LexToken(VAR,'x0',1,1478) -LexToken(ASSIGNMENT,'=',1,1480) -LexToken(VAR,'x0',1,1481) -LexToken(OPENBRACKET,'(',1,1483) -LexToken(COLON,':',1,1484) -LexToken(CLOSEBRACKET,')',1,1485) -LexToken(SEMICOLON,';',1,1486) -LexToken(EOL,'\n',1,1487) -LexToken(VAR,'N',1,1500) -LexToken(ASSIGNMENT,'=',1,1501) -LexToken(VAR,'size',1,1502) -LexToken(OPENBRACKET,'(',1,1506) -LexToken(VAR,'x0',1,1507) -LexToken(COMMA,',',1,1509) -LexToken(DQSTRING,'"*"',1,1512) -LexToken(CLOSEBRACKET,')',1,1513) -LexToken(SEMICOLON,';',1,1514) -LexToken(EOL,'\n',1,1515) -LexToken(VAR,'xd0',1,1528) -LexToken(ASSIGNMENT,'=',1,1531) -LexToken(VAR,'xd0',1,1532) -LexToken(OPENBRACKET,'(',1,1535) -LexToken(COLON,':',1,1536) -LexToken(CLOSEBRACKET,')',1,1537) -LexToken(SEMICOLON,';',1,1538) -LexToken(EOL,'\n',1,1539) -LexToken(VAR,'Nxd',1,1552) -LexToken(ASSIGNMENT,'=',1,1555) -LexToken(VAR,'size',1,1556) -LexToken(OPENBRACKET,'(',1,1560) -LexToken(VAR,'xd0',1,1561) -LexToken(COMMA,',',1,1564) -LexToken(DQSTRING,'"*"',1,1567) -LexToken(CLOSEBRACKET,')',1,1568) -LexToken(SEMICOLON,';',1,1569) -LexToken(EOL,'\n',1,1570) -LexToken(IF,'if',1,1583) -LexToken(OPENBRACKET,'(',1,1586) -LexToken(VAR,'N',1,1587) -LexToken(COMPARISON,'~=',1,1588) -LexToken(VAR,'Nxd',1,1590) -LexToken(CLOSEBRACKET,')',1,1593) -LexToken(THEN,'then',1,1595) -LexToken(EOL,'\n',1,1599) -LexToken(VAR,'message',1,1616) -LexToken(OPENBRACKET,'(',1,1623) -LexToken(DQSTRING,'"Incompatible sizes: states and their derivatives should have the same size "',1,1700) -LexToken(CLOSEBRACKET,')',1,1701) -LexToken(EOL,'\n',1,1702) -LexToken(VAR,'ask_again',1,1719) -LexToken(ASSIGNMENT,'=',1,1728) -LexToken(PREVAR_BOOLEAN,'%t',1,1729) -LexToken(EOL,'\n',1,1731) -LexToken(END,'end',1,1744) -LexToken(EOL,'\n',1,1747) -LexToken(IF,'if',1,1760) -LexToken(OPENBRACKET,'(',1,1763) -LexToken(VAR,'N',1,1764) -LexToken(COMPARISON,'<=',1,1765) -LexToken(NUMBER,'0',1,1767) -LexToken(LOGICAL,'&',1,1769) -LexToken(NOT,'~',1,1771) -LexToken(VAR,'ask_again',1,1772) -LexToken(CLOSEBRACKET,')',1,1781) -LexToken(THEN,'then',1,1783) -LexToken(EOL,'\n',1,1787) -LexToken(VAR,'x_message',1,1804) -LexToken(OPENBRACKET,'(',1,1813) -LexToken(DQSTRING,'"number of states must be > 0 "',1,1844) -LexToken(CLOSEBRACKET,')',1,1845) -LexToken(EOL,'\n',1,1846) -LexToken(VAR,'ask_again',1,1863) -LexToken(ASSIGNMENT,'=',1,1872) -LexToken(PREVAR_BOOLEAN,'%t',1,1873) -LexToken(EOL,'\n',1,1875) -LexToken(END,'end',1,1888) -LexToken(EOL,'\n',1,1891) +LexToken(EOL,'\n',1,952) +LexToken(FUNCTION,'function',1,953) +LexToken(OPENSQBRACKET,'[',1,962) +LexToken(VAR,'x',1,963) +LexToken(COMMA,',',1,964) +LexToken(VAR,'y',1,965) +LexToken(COMMA,',',1,966) +LexToken(VAR,'typ',1,967) +LexToken(CLOSESQBRACKET,']',1,970) +LexToken(ASSIGNMENT,'=',1,971) +LexToken(VAR,'DIFF_c',1,972) +LexToken(OPENBRACKET,'(',1,978) +LexToken(VAR,'job',1,979) +LexToken(COMMA,',',1,982) +LexToken(VAR,'arg1',1,983) +LexToken(COMMA,',',1,987) +LexToken(VAR,'arg2',1,988) +LexToken(CLOSEBRACKET,')',1,992) +LexToken(EOL,'\n',1,993) +LexToken(EOL,'\n',1,1016) +LexToken(VAR,'x',1,1021) +LexToken(ASSIGNMENT,'=',1,1022) +LexToken(OPENSQBRACKET,'[',1,1023) +LexToken(CLOSESQBRACKET,']',1,1024) +LexToken(SEMICOLON,';',1,1025) +LexToken(EOL,'\n',1,1026) +LexToken(VAR,'y',1,1031) +LexToken(ASSIGNMENT,'=',1,1032) +LexToken(OPENSQBRACKET,'[',1,1033) +LexToken(CLOSESQBRACKET,']',1,1034) +LexToken(SEMICOLON,';',1,1035) +LexToken(EOL,'\n',1,1036) +LexToken(VAR,'typ',1,1041) +LexToken(ASSIGNMENT,'=',1,1044) +LexToken(OPENSQBRACKET,'[',1,1045) +LexToken(CLOSESQBRACKET,']',1,1046) +LexToken(SEMICOLON,';',1,1047) +LexToken(EOL,'\n',1,1048) +LexToken(SELECT,'select',1,1053) +LexToken(VAR,'job',1,1060) +LexToken(EOL,'\n',1,1063) +LexToken(CASE,'case',1,1068) +LexToken(DQSTRING,'"set"',1,1077) +LexToken(THEN,'then',1,1079) +LexToken(EOL,'\n',1,1083) +LexToken(VAR,'x',1,1092) +LexToken(ASSIGNMENT,'=',1,1093) +LexToken(VAR,'arg1',1,1094) +LexToken(EOL,'\n',1,1098) +LexToken(VAR,'graphics',1,1107) +LexToken(ASSIGNMENT,'=',1,1115) +LexToken(VAR,'arg1',1,1116) +LexToken(DOT,'.',1,1120) +LexToken(VAR,'graphics',1,1121) +LexToken(SEMICOLON,';',1,1129) +LexToken(EOL,'\n',1,1130) +LexToken(VAR,'exprs',1,1139) +LexToken(ASSIGNMENT,'=',1,1144) +LexToken(VAR,'graphics',1,1145) +LexToken(DOT,'.',1,1153) +LexToken(VAR,'exprs',1,1154) +LexToken(EOL,'\n',1,1159) +LexToken(VAR,'model',1,1168) +LexToken(ASSIGNMENT,'=',1,1173) +LexToken(VAR,'arg1',1,1174) +LexToken(DOT,'.',1,1178) +LexToken(VAR,'model',1,1179) +LexToken(SEMICOLON,';',1,1184) +LexToken(EOL,'\n',1,1185) +LexToken(WHILE,'while',1,1194) +LexToken(PREVAR_BOOLEAN,'%t',1,1200) +LexToken(DO,'do',1,1203) +LexToken(EOL,'\n',1,1205) +LexToken(VAR,'ask_again',1,1218) +LexToken(ASSIGNMENT,'=',1,1227) +LexToken(PREVAR_BOOLEAN,'%f',1,1228) +LexToken(EOL,'\n',1,1230) +LexToken(OPENSQBRACKET,'[',1,1243) +LexToken(VAR,'ok',1,1244) +LexToken(COMMA,',',1,1246) +LexToken(VAR,'x0',1,1247) +LexToken(COMMA,',',1,1249) +LexToken(VAR,'xd0',1,1250) +LexToken(COMMA,',',1,1253) +LexToken(VAR,'exprs',1,1254) +LexToken(CLOSESQBRACKET,']',1,1259) +LexToken(ASSIGNMENT,'=',1,1260) +LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1261) +LexToken(OPENBRACKET,'(',1,1276) +LexToken(DQSTRING,'"Set continuous linear system parameters"',1,1317) +LexToken(COMMA,',',1,1318) +LexToken(OPENSQBRACKET,'[',1,1334) +LexToken(DQSTRING,'"Initial state"',1,1349) +LexToken(SEMICOLON,';',1,1350) +LexToken(DQSTRING,'"Initial Derivative"',1,1370) +LexToken(CLOSESQBRACKET,']',1,1371) +LexToken(COMMA,',',1,1372) +LexToken(VAR,'list',1,1373) +LexToken(OPENBRACKET,'(',1,1377) +LexToken(DQSTRING,'"vec"',1,1382) +LexToken(COMMA,',',1,1383) +LexToken(ADDITION,'-',1,1384) +LexToken(NUMBER,'1',1,1385) +LexToken(COMMA,',',1,1386) +LexToken(DQSTRING,'"vec"',1,1391) +LexToken(COMMA,',',1,1392) +LexToken(ADDITION,'-',1,1393) +LexToken(NUMBER,'1',1,1394) +LexToken(CLOSEBRACKET,')',1,1395) +LexToken(COMMA,',',1,1396) +LexToken(VAR,'exprs',1,1397) +LexToken(CLOSEBRACKET,')',1,1402) +LexToken(EOL,'\n',1,1403) +LexToken(IF,'if',1,1416) +LexToken(NOT,'~',1,1419) +LexToken(VAR,'ok',1,1420) +LexToken(THEN,'then',1,1423) +LexToken(EOL,'\n',1,1427) +LexToken(BREAK,'break',1,1444) +LexToken(COMMA,',',1,1449) +LexToken(EOL,'\n',1,1450) +LexToken(END,'end',1,1463) +LexToken(EOL,'\n',1,1466) +LexToken(VAR,'x0',1,1479) +LexToken(ASSIGNMENT,'=',1,1481) +LexToken(VAR,'x0',1,1482) +LexToken(OPENBRACKET,'(',1,1484) +LexToken(COLON,':',1,1485) +LexToken(CLOSEBRACKET,')',1,1486) +LexToken(SEMICOLON,';',1,1487) +LexToken(EOL,'\n',1,1488) +LexToken(VAR,'N',1,1501) +LexToken(ASSIGNMENT,'=',1,1502) +LexToken(VAR,'size',1,1503) +LexToken(OPENBRACKET,'(',1,1507) +LexToken(VAR,'x0',1,1508) +LexToken(COMMA,',',1,1510) +LexToken(DQSTRING,'"*"',1,1513) +LexToken(CLOSEBRACKET,')',1,1514) +LexToken(SEMICOLON,';',1,1515) +LexToken(EOL,'\n',1,1516) +LexToken(VAR,'xd0',1,1529) +LexToken(ASSIGNMENT,'=',1,1532) +LexToken(VAR,'xd0',1,1533) +LexToken(OPENBRACKET,'(',1,1536) +LexToken(COLON,':',1,1537) +LexToken(CLOSEBRACKET,')',1,1538) +LexToken(SEMICOLON,';',1,1539) +LexToken(EOL,'\n',1,1540) +LexToken(VAR,'Nxd',1,1553) +LexToken(ASSIGNMENT,'=',1,1556) +LexToken(VAR,'size',1,1557) +LexToken(OPENBRACKET,'(',1,1561) +LexToken(VAR,'xd0',1,1562) +LexToken(COMMA,',',1,1565) +LexToken(DQSTRING,'"*"',1,1568) +LexToken(CLOSEBRACKET,')',1,1569) +LexToken(SEMICOLON,';',1,1570) +LexToken(EOL,'\n',1,1571) +LexToken(IF,'if',1,1584) +LexToken(OPENBRACKET,'(',1,1587) +LexToken(VAR,'N',1,1588) +LexToken(COMPARISON,'~=',1,1589) +LexToken(VAR,'Nxd',1,1591) +LexToken(CLOSEBRACKET,')',1,1594) +LexToken(THEN,'then',1,1596) +LexToken(EOL,'\n',1,1600) +LexToken(VAR,'message',1,1617) +LexToken(OPENBRACKET,'(',1,1624) +LexToken(DQSTRING,'"Incompatible sizes: states and their derivatives should have the same size "',1,1701) +LexToken(CLOSEBRACKET,')',1,1702) +LexToken(EOL,'\n',1,1703) +LexToken(VAR,'ask_again',1,1720) +LexToken(ASSIGNMENT,'=',1,1729) +LexToken(PREVAR_BOOLEAN,'%t',1,1730) +LexToken(EOL,'\n',1,1732) +LexToken(END,'end',1,1745) +LexToken(EOL,'\n',1,1748) +LexToken(IF,'if',1,1761) +LexToken(OPENBRACKET,'(',1,1764) +LexToken(VAR,'N',1,1765) +LexToken(COMPARISON,'<=',1,1766) +LexToken(NUMBER,'0',1,1768) +LexToken(LOGICAL,'&',1,1770) +LexToken(NOT,'~',1,1772) +LexToken(VAR,'ask_again',1,1773) +LexToken(CLOSEBRACKET,')',1,1782) +LexToken(THEN,'then',1,1784) +LexToken(EOL,'\n',1,1788) +LexToken(VAR,'x_message',1,1805) +LexToken(OPENBRACKET,'(',1,1814) +LexToken(DQSTRING,'"number of states must be > 0 "',1,1845) +LexToken(CLOSEBRACKET,')',1,1846) +LexToken(EOL,'\n',1,1847) +LexToken(VAR,'ask_again',1,1864) +LexToken(ASSIGNMENT,'=',1,1873) +LexToken(PREVAR_BOOLEAN,'%t',1,1874) +LexToken(EOL,'\n',1,1876) +LexToken(END,'end',1,1889) LexToken(EOL,'\n',1,1892) -LexToken(IF,'if',1,1905) -LexToken(NOT,'~',1,1908) -LexToken(VAR,'ask_again',1,1909) -LexToken(THEN,'then',1,1920) -LexToken(EOL,'\n',1,1924) -LexToken(VAR,'graphics',1,1941) -LexToken(DOT,'.',1,1949) -LexToken(VAR,'exprs',1,1950) -LexToken(ASSIGNMENT,'=',1,1955) -LexToken(VAR,'exprs',1,1956) -LexToken(EOL,'\n',1,1961) -LexToken(VAR,'model',1,1978) -LexToken(DOT,'.',1,1983) -LexToken(VAR,'state',1,1984) -LexToken(ASSIGNMENT,'=',1,1989) -LexToken(OPENSQBRACKET,'[',1,1990) -LexToken(VAR,'x0',1,1991) -LexToken(SEMICOLON,';',1,1993) -LexToken(VAR,'xd0',1,1994) -LexToken(CLOSESQBRACKET,']',1,1997) -LexToken(SEMICOLON,';',1,1998) -LexToken(EOL,'\n',1,1999) -LexToken(VAR,'model',1,2016) -LexToken(DOT,'.',1,2021) -LexToken(VAR,'out',1,2022) -LexToken(ASSIGNMENT,'=',1,2025) -LexToken(OPENSQBRACKET,'[',1,2026) -LexToken(VAR,'N',1,2027) -LexToken(CLOSESQBRACKET,']',1,2028) -LexToken(EOL,'\n',1,2029) -LexToken(VAR,'model',1,2046) -LexToken(DOT,'.',1,2051) -LexToken(VAR,'in',1,2052) -LexToken(ASSIGNMENT,'=',1,2054) -LexToken(VAR,'N',1,2055) -LexToken(EOL,'\n',1,2056) -LexToken(VAR,'x',1,2073) -LexToken(DOT,'.',1,2074) -LexToken(VAR,'graphics',1,2075) -LexToken(ASSIGNMENT,'=',1,2083) -LexToken(VAR,'graphics',1,2084) -LexToken(SEMICOLON,';',1,2092) -LexToken(EOL,'\n',1,2093) -LexToken(VAR,'x',1,2110) -LexToken(DOT,'.',1,2111) -LexToken(VAR,'model',1,2112) -LexToken(ASSIGNMENT,'=',1,2117) -LexToken(VAR,'model',1,2118) -LexToken(EOL,'\n',1,2123) -LexToken(BREAK,'break',1,2140) -LexToken(EOL,'\n',1,2145) -LexToken(END,'end',1,2158) -LexToken(EOL,'\n',1,2161) -LexToken(END,'end',1,2170) -LexToken(EOL,'\n',1,2173) -LexToken(VAR,'x',1,2182) -LexToken(DOT,'.',1,2183) -LexToken(VAR,'model',1,2184) -LexToken(DOT,'.',1,2189) -LexToken(VAR,'firing',1,2190) -LexToken(ASSIGNMENT,'=',1,2196) -LexToken(OPENSQBRACKET,'[',1,2197) -LexToken(CLOSESQBRACKET,']',1,2198) -LexToken(EOL,'\n',1,2215) -LexToken(CASE,'case',1,2220) -LexToken(DQSTRING,'"define"',1,2232) -LexToken(THEN,'then',1,2234) -LexToken(EOL,'\n',1,2238) -LexToken(VAR,'x0',1,2247) -LexToken(ASSIGNMENT,'=',1,2249) -LexToken(OPENSQBRACKET,'[',1,2250) -LexToken(NUMBER,'0',1,2251) -LexToken(SEMICOLON,';',1,2252) -LexToken(NUMBER,'0',1,2253) -LexToken(CLOSESQBRACKET,']',1,2254) -LexToken(EOL,'\n',1,2255) -LexToken(VAR,'model',1,2264) -LexToken(ASSIGNMENT,'=',1,2269) -LexToken(SCICOS_MODEL,'scicos_model',1,2270) -LexToken(OPENBRACKET,'(',1,2282) -LexToken(CLOSEBRACKET,')',1,2283) -LexToken(EOL,'\n',1,2284) -LexToken(VAR,'model',1,2293) -LexToken(DOT,'.',1,2298) -LexToken(VAR,'sim',1,2299) -LexToken(ASSIGNMENT,'=',1,2302) -LexToken(VAR,'list',1,2303) -LexToken(OPENBRACKET,'(',1,2307) -LexToken(DQSTRING,'"diffblk_c"',1,2318) -LexToken(COMMA,',',1,2319) -LexToken(NUMBER,'10004',1,2320) -LexToken(CLOSEBRACKET,')',1,2325) -LexToken(EOL,'\n',1,2326) -LexToken(VAR,'model',1,2335) -LexToken(DOT,'.',1,2340) -LexToken(VAR,'in',1,2341) -LexToken(ASSIGNMENT,'=',1,2343) -LexToken(NUMBER,'1',1,2344) -LexToken(EOL,'\n',1,2345) -LexToken(VAR,'model',1,2354) -LexToken(DOT,'.',1,2359) -LexToken(VAR,'out',1,2360) -LexToken(ASSIGNMENT,'=',1,2363) -LexToken(NUMBER,'1',1,2364) -LexToken(EOL,'\n',1,2365) -LexToken(VAR,'model',1,2374) -LexToken(DOT,'.',1,2379) -LexToken(VAR,'state',1,2380) -LexToken(ASSIGNMENT,'=',1,2385) -LexToken(VAR,'x0',1,2386) -LexToken(EOL,'\n',1,2388) -LexToken(VAR,'model',1,2397) -LexToken(DOT,'.',1,2402) -LexToken(VAR,'blocktype',1,2403) -LexToken(ASSIGNMENT,'=',1,2412) -LexToken(DQSTRING,'"c"',1,2415) -LexToken(EOL,'\n',1,2416) -LexToken(VAR,'model',1,2425) -LexToken(DOT,'.',1,2430) -LexToken(VAR,'dep_ut',1,2431) -LexToken(ASSIGNMENT,'=',1,2437) -LexToken(OPENSQBRACKET,'[',1,2438) -LexToken(PREVAR_BOOLEAN,'%f',1,2439) -LexToken(PREVAR_BOOLEAN,'%t',1,2442) -LexToken(CLOSESQBRACKET,']',1,2444) -LexToken(EOL,'\n',1,2445) +LexToken(EOL,'\n',1,1893) +LexToken(IF,'if',1,1906) +LexToken(NOT,'~',1,1909) +LexToken(VAR,'ask_again',1,1910) +LexToken(THEN,'then',1,1921) +LexToken(EOL,'\n',1,1925) +LexToken(VAR,'graphics',1,1942) +LexToken(DOT,'.',1,1950) +LexToken(VAR,'exprs',1,1951) +LexToken(ASSIGNMENT,'=',1,1956) +LexToken(VAR,'exprs',1,1957) +LexToken(EOL,'\n',1,1962) +LexToken(VAR,'model',1,1979) +LexToken(DOT,'.',1,1984) +LexToken(VAR,'state',1,1985) +LexToken(ASSIGNMENT,'=',1,1990) +LexToken(OPENSQBRACKET,'[',1,1991) +LexToken(VAR,'x0',1,1992) +LexToken(SEMICOLON,';',1,1994) +LexToken(VAR,'xd0',1,1995) +LexToken(CLOSESQBRACKET,']',1,1998) +LexToken(SEMICOLON,';',1,1999) +LexToken(EOL,'\n',1,2000) +LexToken(VAR,'model',1,2017) +LexToken(DOT,'.',1,2022) +LexToken(VAR,'out',1,2023) +LexToken(ASSIGNMENT,'=',1,2026) +LexToken(OPENSQBRACKET,'[',1,2027) +LexToken(VAR,'N',1,2028) +LexToken(CLOSESQBRACKET,']',1,2029) +LexToken(EOL,'\n',1,2030) +LexToken(VAR,'model',1,2047) +LexToken(DOT,'.',1,2052) +LexToken(VAR,'in',1,2053) +LexToken(ASSIGNMENT,'=',1,2055) +LexToken(VAR,'N',1,2056) +LexToken(EOL,'\n',1,2057) +LexToken(VAR,'x',1,2074) +LexToken(DOT,'.',1,2075) +LexToken(VAR,'graphics',1,2076) +LexToken(ASSIGNMENT,'=',1,2084) +LexToken(VAR,'graphics',1,2085) +LexToken(SEMICOLON,';',1,2093) +LexToken(EOL,'\n',1,2094) +LexToken(VAR,'x',1,2111) +LexToken(DOT,'.',1,2112) +LexToken(VAR,'model',1,2113) +LexToken(ASSIGNMENT,'=',1,2118) +LexToken(VAR,'model',1,2119) +LexToken(EOL,'\n',1,2124) +LexToken(BREAK,'break',1,2141) +LexToken(EOL,'\n',1,2146) +LexToken(END,'end',1,2159) +LexToken(EOL,'\n',1,2162) +LexToken(END,'end',1,2171) +LexToken(EOL,'\n',1,2174) +LexToken(VAR,'x',1,2183) +LexToken(DOT,'.',1,2184) +LexToken(VAR,'model',1,2185) +LexToken(DOT,'.',1,2190) +LexToken(VAR,'firing',1,2191) +LexToken(ASSIGNMENT,'=',1,2197) +LexToken(OPENSQBRACKET,'[',1,2198) +LexToken(CLOSESQBRACKET,']',1,2199) +LexToken(EOL,'\n',1,2216) +LexToken(CASE,'case',1,2221) +LexToken(DQSTRING,'"define"',1,2233) +LexToken(THEN,'then',1,2235) +LexToken(EOL,'\n',1,2239) +LexToken(VAR,'x0',1,2248) +LexToken(ASSIGNMENT,'=',1,2250) +LexToken(OPENSQBRACKET,'[',1,2251) +LexToken(NUMBER,'0',1,2252) +LexToken(SEMICOLON,';',1,2253) +LexToken(NUMBER,'0',1,2254) +LexToken(CLOSESQBRACKET,']',1,2255) +LexToken(EOL,'\n',1,2256) +LexToken(VAR,'model',1,2265) +LexToken(ASSIGNMENT,'=',1,2270) +LexToken(SCICOS_MODEL,'scicos_model',1,2271) +LexToken(OPENBRACKET,'(',1,2283) +LexToken(CLOSEBRACKET,')',1,2284) +LexToken(EOL,'\n',1,2285) +LexToken(VAR,'model',1,2294) +LexToken(DOT,'.',1,2299) +LexToken(VAR,'sim',1,2300) +LexToken(ASSIGNMENT,'=',1,2303) +LexToken(VAR,'list',1,2304) +LexToken(OPENBRACKET,'(',1,2308) +LexToken(DQSTRING,'"diffblk_c"',1,2319) +LexToken(COMMA,',',1,2320) +LexToken(NUMBER,'10004',1,2321) +LexToken(CLOSEBRACKET,')',1,2326) +LexToken(EOL,'\n',1,2327) +LexToken(VAR,'model',1,2336) +LexToken(DOT,'.',1,2341) +LexToken(VAR,'in',1,2342) +LexToken(ASSIGNMENT,'=',1,2344) +LexToken(NUMBER,'1',1,2345) +LexToken(EOL,'\n',1,2346) +LexToken(VAR,'model',1,2355) +LexToken(DOT,'.',1,2360) +LexToken(VAR,'out',1,2361) +LexToken(ASSIGNMENT,'=',1,2364) +LexToken(NUMBER,'1',1,2365) +LexToken(EOL,'\n',1,2366) +LexToken(VAR,'model',1,2375) +LexToken(DOT,'.',1,2380) +LexToken(VAR,'state',1,2381) +LexToken(ASSIGNMENT,'=',1,2386) +LexToken(VAR,'x0',1,2387) +LexToken(EOL,'\n',1,2389) +LexToken(VAR,'model',1,2398) +LexToken(DOT,'.',1,2403) +LexToken(VAR,'blocktype',1,2404) +LexToken(ASSIGNMENT,'=',1,2413) +LexToken(DQSTRING,'"c"',1,2416) +LexToken(EOL,'\n',1,2417) +LexToken(VAR,'model',1,2426) +LexToken(DOT,'.',1,2431) +LexToken(VAR,'dep_ut',1,2432) +LexToken(ASSIGNMENT,'=',1,2438) +LexToken(OPENSQBRACKET,'[',1,2439) +LexToken(PREVAR_BOOLEAN,'%f',1,2440) +LexToken(PREVAR_BOOLEAN,'%t',1,2443) +LexToken(CLOSESQBRACKET,']',1,2445) LexToken(EOL,'\n',1,2446) -LexToken(VAR,'exprs',1,2455) -LexToken(ASSIGNMENT,'=',1,2460) -LexToken(OPENSQBRACKET,'[',1,2461) -LexToken(VAR,'strcat',1,2462) -LexToken(OPENBRACKET,'(',1,2468) -LexToken(VAR,'sci2exp',1,2469) -LexToken(OPENBRACKET,'(',1,2476) -LexToken(VAR,'x0',1,2477) -LexToken(OPENBRACKET,'(',1,2479) -LexToken(NUMBER,'1',1,2480) -LexToken(CLOSEBRACKET,')',1,2481) +LexToken(EOL,'\n',1,2447) +LexToken(VAR,'exprs',1,2456) +LexToken(ASSIGNMENT,'=',1,2461) +LexToken(OPENSQBRACKET,'[',1,2462) +LexToken(VAR,'strcat',1,2463) +LexToken(OPENBRACKET,'(',1,2469) +LexToken(VAR,'sci2exp',1,2470) +LexToken(OPENBRACKET,'(',1,2477) +LexToken(VAR,'x0',1,2478) +LexToken(OPENBRACKET,'(',1,2480) +LexToken(NUMBER,'1',1,2481) LexToken(CLOSEBRACKET,')',1,2482) LexToken(CLOSEBRACKET,')',1,2483) -LexToken(SEMICOLON,';',1,2484) -LexToken(VAR,'strcat',1,2485) -LexToken(OPENBRACKET,'(',1,2491) -LexToken(VAR,'sci2exp',1,2492) -LexToken(OPENBRACKET,'(',1,2499) -LexToken(VAR,'x0',1,2500) -LexToken(OPENBRACKET,'(',1,2502) -LexToken(NUMBER,'2',1,2503) -LexToken(CLOSEBRACKET,')',1,2504) +LexToken(CLOSEBRACKET,')',1,2484) +LexToken(SEMICOLON,';',1,2485) +LexToken(VAR,'strcat',1,2486) +LexToken(OPENBRACKET,'(',1,2492) +LexToken(VAR,'sci2exp',1,2493) +LexToken(OPENBRACKET,'(',1,2500) +LexToken(VAR,'x0',1,2501) +LexToken(OPENBRACKET,'(',1,2503) +LexToken(NUMBER,'2',1,2504) LexToken(CLOSEBRACKET,')',1,2505) LexToken(CLOSEBRACKET,')',1,2506) -LexToken(CLOSESQBRACKET,']',1,2507) -LexToken(EOL,'\n',1,2508) -LexToken(VAR,'gr_i',1,2517) -LexToken(ASSIGNMENT,'=',1,2521) -LexToken(OPENSQBRACKET,'[',1,2522) -LexToken(CLOSESQBRACKET,']',1,2523) -LexToken(EOL,'\n',1,2524) -LexToken(VAR,'x',1,2533) -LexToken(ASSIGNMENT,'=',1,2534) -LexToken(VAR,'standard_define',1,2535) -LexToken(OPENBRACKET,'(',1,2550) -LexToken(OPENSQBRACKET,'[',1,2551) -LexToken(NUMBER,'2',1,2552) -LexToken(NUMBER,'2',1,2554) -LexToken(CLOSESQBRACKET,']',1,2555) -LexToken(COMMA,',',1,2556) -LexToken(VAR,'model',1,2557) -LexToken(COMMA,',',1,2562) -LexToken(VAR,'exprs',1,2563) -LexToken(COMMA,',',1,2568) -LexToken(VAR,'gr_i',1,2569) -LexToken(CLOSEBRACKET,')',1,2573) -LexToken(EOL,'\n',1,2574) -LexToken(END,'end',1,2579) -LexToken(EOL,'\n',1,2582) -LexToken(ENDFUNCTION,'endfunction',1,2583) -LexToken(EOL,'\n',1,2594) +LexToken(CLOSEBRACKET,')',1,2507) +LexToken(CLOSESQBRACKET,']',1,2508) +LexToken(EOL,'\n',1,2509) +LexToken(VAR,'gr_i',1,2518) +LexToken(ASSIGNMENT,'=',1,2522) +LexToken(OPENSQBRACKET,'[',1,2523) +LexToken(CLOSESQBRACKET,']',1,2524) +LexToken(EOL,'\n',1,2525) +LexToken(VAR,'x',1,2534) +LexToken(ASSIGNMENT,'=',1,2535) +LexToken(VAR,'standard_define',1,2536) +LexToken(OPENBRACKET,'(',1,2551) +LexToken(OPENSQBRACKET,'[',1,2552) +LexToken(NUMBER,'2',1,2553) +LexToken(NUMBER,'2',1,2555) +LexToken(CLOSESQBRACKET,']',1,2556) +LexToken(COMMA,',',1,2557) +LexToken(VAR,'model',1,2558) +LexToken(COMMA,',',1,2563) +LexToken(VAR,'exprs',1,2564) +LexToken(COMMA,',',1,2569) +LexToken(VAR,'gr_i',1,2570) +LexToken(CLOSEBRACKET,')',1,2574) +LexToken(EOL,'\n',1,2575) +LexToken(END,'end',1,2580) +LexToken(EOL,'\n',1,2583) +LexToken(ENDFUNCTION,'endfunction',1,2584) +LexToken(EOL,'\n',1,2595) diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index e2eab222..fc840ea0 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -390,7 +390,8 @@ LexToken(SEMICOLON,';',1,2560) LexToken(EOL,'\n',1,2561) LexToken(VAR,'A',1,2570) LexToken(ASSIGNMENT,'=',1,2571) -LexToken(NUMBER,'-1',1,2572) +LexToken(ADDITION,'-',1,2572) +LexToken(NUMBER,'1',1,2573) LexToken(SEMICOLON,';',1,2574) LexToken(EOL,'\n',1,2575) LexToken(VAR,'B',1,2584) diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 683254fb..be5ebb65 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -389,7 +389,8 @@ LexToken(SEMICOLON,';',1,2532) LexToken(EOL,'\n',1,2533) LexToken(VAR,'A',1,2542) LexToken(ASSIGNMENT,'=',1,2543) -LexToken(NUMBER,'-1',1,2544) +LexToken(ADDITION,'-',1,2544) +LexToken(NUMBER,'1',1,2545) LexToken(SEMICOLON,';',1,2546) LexToken(EOL,'\n',1,2547) LexToken(VAR,'B',1,2556) diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 618b5e36..01898a3a 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -153,9 +153,11 @@ LexToken(OPENBRACKET,'(',1,1396) LexToken(DQSTRING,'"mat"',1,1401) LexToken(COMMA,',',1,1402) LexToken(OPENSQBRACKET,'[',1,1403) -LexToken(NUMBER,'-1',1,1404) +LexToken(ADDITION,'-',1,1404) +LexToken(NUMBER,'1',1,1405) LexToken(COMMA,',',1,1406) -LexToken(NUMBER,'-1',1,1407) +LexToken(ADDITION,'-',1,1407) +LexToken(NUMBER,'1',1,1408) LexToken(CLOSESQBRACKET,']',1,1409) LexToken(COMMA,',',1,1410) LexToken(DQSTRING,'"mat"',1,1430) @@ -177,8 +179,10 @@ LexToken(COMMA,',',1,1492) LexToken(DQSTRING,'"mat"',1,1512) LexToken(COMMA,',',1,1513) LexToken(OPENSQBRACKET,'[',1,1514) -LexToken(NUMBER,'-1',1,1515) -LexToken(NUMBER,'-1',1,1518) +LexToken(ADDITION,'-',1,1515) +LexToken(NUMBER,'1',1,1516) +LexToken(ADDITION,'-',1,1518) +LexToken(NUMBER,'1',1,1519) LexToken(CLOSESQBRACKET,']',1,1520) LexToken(COMMA,',',1,1521) LexToken(DQSTRING,'"vec"',1,1541) @@ -276,7 +280,7 @@ LexToken(VAR,'C',1,1907) LexToken(COMMA,',',1,1908) LexToken(NUMBER,'1',1,1909) LexToken(CLOSEBRACKET,')',1,1910) -LexToken(OPERATOR,'*',1,1911) +LexToken(MULTIPLICATION,'*',1,1911) LexToken(VAR,'size',1,1912) LexToken(OPENBRACKET,'(',1,1916) LexToken(VAR,'B',1,1917) @@ -299,11 +303,11 @@ LexToken(EOL,'\n',1,1965) LexToken(VAR,'D',1,1986) LexToken(ASSIGNMENT,'=',1,1988) LexToken(VAR,'D',1,1990) -LexToken(OPERATOR,'*',1,1991) +LexToken(MULTIPLICATION,'*',1,1991) LexToken(VAR,'ones',1,1992) LexToken(OPENBRACKET,'(',1,1996) LexToken(VAR,'C',1,1997) -LexToken(OPERATOR,'*',1,1998) +LexToken(MULTIPLICATION,'*',1,1998) LexToken(VAR,'B',1,1999) LexToken(CLOSEBRACKET,')',1,2000) LexToken(SEMICOLON,';',1,2002) @@ -324,7 +328,7 @@ LexToken(ASSIGNMENT,'=',1,2070) LexToken(VAR,'zeros',1,2072) LexToken(OPENBRACKET,'(',1,2077) LexToken(VAR,'C',1,2078) -LexToken(OPERATOR,'*',1,2079) +LexToken(MULTIPLICATION,'*',1,2079) LexToken(VAR,'B',1,2080) LexToken(CLOSEBRACKET,')',1,2081) LexToken(SEMICOLON,';',1,2083) @@ -537,7 +541,8 @@ LexToken(SEMICOLON,';',1,3158) LexToken(EOL,'\n',1,3159) LexToken(VAR,'A',1,3168) LexToken(ASSIGNMENT,'=',1,3169) -LexToken(NUMBER,'-1',1,3170) +LexToken(ADDITION,'-',1,3170) +LexToken(NUMBER,'1',1,3171) LexToken(SEMICOLON,';',1,3172) LexToken(EOL,'\n',1,3173) LexToken(VAR,'B',1,3182) diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index da708052..d8d22bd1 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -153,9 +153,11 @@ LexToken(OPENBRACKET,'(',1,1398) LexToken(DQSTRING,'"mat"',1,1403) LexToken(COMMA,',',1,1404) LexToken(OPENSQBRACKET,'[',1,1405) -LexToken(NUMBER,'-1',1,1406) +LexToken(ADDITION,'-',1,1406) +LexToken(NUMBER,'1',1,1407) LexToken(COMMA,',',1,1408) -LexToken(NUMBER,'-1',1,1409) +LexToken(ADDITION,'-',1,1409) +LexToken(NUMBER,'1',1,1410) LexToken(CLOSESQBRACKET,']',1,1411) LexToken(COMMA,',',1,1412) LexToken(DQSTRING,'"mat"',1,1432) @@ -177,8 +179,10 @@ LexToken(COMMA,',',1,1494) LexToken(DQSTRING,'"mat"',1,1514) LexToken(COMMA,',',1,1515) LexToken(OPENSQBRACKET,'[',1,1516) -LexToken(NUMBER,'-1',1,1517) -LexToken(NUMBER,'-1',1,1520) +LexToken(ADDITION,'-',1,1517) +LexToken(NUMBER,'1',1,1518) +LexToken(ADDITION,'-',1,1520) +LexToken(NUMBER,'1',1,1521) LexToken(CLOSESQBRACKET,']',1,1522) LexToken(COMMA,',',1,1523) LexToken(DQSTRING,'"vec"',1,1543) @@ -450,7 +454,8 @@ LexToken(NUMBER,'0',1,2842) LexToken(SEMICOLON,';',1,2843) LexToken(VAR,'A',1,2844) LexToken(ASSIGNMENT,'=',1,2845) -LexToken(NUMBER,'-1',1,2846) +LexToken(ADDITION,'-',1,2846) +LexToken(NUMBER,'1',1,2847) LexToken(SEMICOLON,';',1,2848) LexToken(VAR,'B',1,2849) LexToken(ASSIGNMENT,'=',1,2850) diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 5c6ced2b..ebd40fb9 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -138,13 +138,16 @@ LexToken(OPENBRACKET,'(',1,1322) LexToken(DQSTRING,'"mat"',1,1327) LexToken(COMMA,',',1,1328) LexToken(OPENSQBRACKET,'[',1,1329) -LexToken(NUMBER,'-1',1,1330) -LexToken(NUMBER,'-2',1,1333) +LexToken(ADDITION,'-',1,1330) +LexToken(NUMBER,'1',1,1331) +LexToken(ADDITION,'-',1,1333) +LexToken(NUMBER,'2',1,1334) LexToken(CLOSESQBRACKET,']',1,1335) LexToken(COMMA,',',1,1336) LexToken(DQSTRING,'"vec"',1,1341) LexToken(COMMA,',',1,1342) -LexToken(NUMBER,'-1',1,1343) +LexToken(ADDITION,'-',1,1343) +LexToken(NUMBER,'1',1,1344) LexToken(CLOSEBRACKET,')',1,1345) LexToken(COMMA,',',1,1346) LexToken(VAR,'exprs',1,1347) @@ -498,7 +501,7 @@ LexToken(COMMA,',',1,2833) LexToken(VAR,'ones',1,2834) LexToken(OPENBRACKET,'(',1,2838) LexToken(NUMBER,'1',1,2839) -LexToken(OPERATOR,'-',1,2840) +LexToken(ADDITION,'-',1,2840) LexToken(VAR,'inh',1,2841) LexToken(COMMA,',',1,2844) LexToken(NUMBER,'1',1,2845) @@ -602,7 +605,7 @@ LexToken(DOT,'.',1,3258) LexToken(VAR,'evtin',1,3259) LexToken(ASSIGNMENT,'=',1,3264) LexToken(NUMBER,'1',1,3265) -LexToken(OPERATOR,'-',1,3266) +LexToken(ADDITION,'-',1,3266) LexToken(VAR,'inh',1,3267) LexToken(EOL,'\n',1,3270) LexToken(VAR,'model',1,3279) diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 8c0fef59..f20f6f61 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -137,11 +137,13 @@ LexToken(VAR,'list',1,1320) LexToken(OPENBRACKET,'(',1,1324) LexToken(DQSTRING,'"vec"',1,1329) LexToken(COMMA,',',1,1330) -LexToken(NUMBER,'-1',1,1331) +LexToken(ADDITION,'-',1,1331) +LexToken(NUMBER,'1',1,1332) LexToken(COMMA,',',1,1333) LexToken(DQSTRING,'"vec"',1,1338) LexToken(COMMA,',',1,1339) -LexToken(NUMBER,'-1',1,1340) +LexToken(ADDITION,'-',1,1340) +LexToken(NUMBER,'1',1,1341) LexToken(CLOSEBRACKET,')',1,1342) LexToken(COMMA,',',1,1343) LexToken(VAR,'exprs',1,1344) @@ -204,14 +206,16 @@ LexToken(VAR,'model',1,1598) LexToken(COMMA,',',1,1603) LexToken(VAR,'graphics',1,1604) LexToken(COMMA,',',1,1612) -LexToken(NUMBER,'-1',1,1613) +LexToken(ADDITION,'-',1,1613) +LexToken(NUMBER,'1',1,1614) LexToken(COMMA,',',1,1615) -LexToken(NUMBER,'-1',1,1616) +LexToken(ADDITION,'-',1,1616) +LexToken(NUMBER,'1',1,1617) LexToken(COMMA,',',1,1618) LexToken(VAR,'ones',1,1619) LexToken(OPENBRACKET,'(',1,1623) LexToken(NUMBER,'1',1,1624) -LexToken(OPERATOR,'-',1,1625) +LexToken(ADDITION,'-',1,1625) LexToken(VAR,'inh',1,1626) LexToken(COMMA,',',1,1629) LexToken(NUMBER,'1',1,1630) @@ -330,7 +334,7 @@ LexToken(DOT,'.',1,2125) LexToken(VAR,'evtin',1,2126) LexToken(ASSIGNMENT,'=',1,2131) LexToken(NUMBER,'1',1,2132) -LexToken(OPERATOR,'-',1,2133) +LexToken(ADDITION,'-',1,2133) LexToken(VAR,'inh',1,2134) LexToken(EOL,'\n',1,2137) LexToken(VAR,'model',1,2146) diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index e5b71a1e..4dc9765c 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -138,13 +138,16 @@ LexToken(OPENBRACKET,'(',1,1324) LexToken(DQSTRING,'"mat"',1,1329) LexToken(COMMA,',',1,1330) LexToken(OPENSQBRACKET,'[',1,1331) -LexToken(NUMBER,'-1',1,1332) -LexToken(NUMBER,'-2',1,1335) +LexToken(ADDITION,'-',1,1332) +LexToken(NUMBER,'1',1,1333) +LexToken(ADDITION,'-',1,1335) +LexToken(NUMBER,'2',1,1336) LexToken(CLOSESQBRACKET,']',1,1337) LexToken(COMMA,',',1,1338) LexToken(DQSTRING,'"vec"',1,1343) LexToken(COMMA,',',1,1344) -LexToken(NUMBER,'-1',1,1345) +LexToken(ADDITION,'-',1,1345) +LexToken(NUMBER,'1',1,1346) LexToken(CLOSEBRACKET,')',1,1347) LexToken(COMMA,',',1,1348) LexToken(VAR,'exprs',1,1349) @@ -498,7 +501,7 @@ LexToken(COMMA,',',1,2834) LexToken(VAR,'ones',1,2835) LexToken(OPENBRACKET,'(',1,2839) LexToken(NUMBER,'1',1,2840) -LexToken(OPERATOR,'-',1,2841) +LexToken(ADDITION,'-',1,2841) LexToken(VAR,'inh',1,2842) LexToken(COMMA,',',1,2845) LexToken(NUMBER,'1',1,2846) @@ -602,7 +605,7 @@ LexToken(DOT,'.',1,3259) LexToken(VAR,'evtin',1,3260) LexToken(ASSIGNMENT,'=',1,3265) LexToken(NUMBER,'1',1,3266) -LexToken(OPERATOR,'-',1,3267) +LexToken(ADDITION,'-',1,3267) LexToken(VAR,'inh',1,3268) LexToken(EOL,'\n',1,3271) LexToken(VAR,'model',1,3280) diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 1c5bb5a4..d1888500 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -144,9 +144,11 @@ LexToken(OPENBRACKET,'(',1,1354) LexToken(DQSTRING,'"mat"',1,1359) LexToken(COMMA,',',1,1360) LexToken(OPENSQBRACKET,'[',1,1361) -LexToken(NUMBER,'-1',1,1362) +LexToken(ADDITION,'-',1,1362) +LexToken(NUMBER,'1',1,1363) LexToken(COMMA,',',1,1364) -LexToken(NUMBER,'-1',1,1365) +LexToken(ADDITION,'-',1,1365) +LexToken(NUMBER,'1',1,1366) LexToken(CLOSESQBRACKET,']',1,1367) LexToken(COMMA,',',1,1368) LexToken(DQSTRING,'"vec"',1,1373) @@ -847,7 +849,7 @@ LexToken(CLOSEBRACKET,')',1,5672) LexToken(EOL,'\n',1,5673) LexToken(IF,'if',1,5694) LexToken(VAR,'out',1,5697) -LexToken(OPERATOR,'*',1,5700) +LexToken(MULTIPLICATION,'*',1,5700) LexToken(VAR,'in',1,5701) LexToken(COMPARISON,'<>',1,5703) LexToken(NUMBER,'1',1,5705) @@ -872,7 +874,8 @@ LexToken(OPENBRACKET,'(',1,5810) LexToken(OPENSQBRACKET,'[',1,5811) LexToken(VAR,'in',1,5812) LexToken(COMMA,',',1,5814) -LexToken(NUMBER,'-1',1,5815) +LexToken(ADDITION,'-',1,5815) +LexToken(NUMBER,'1',1,5816) LexToken(CLOSESQBRACKET,']',1,5817) LexToken(COMMA,',',1,5818) LexToken(VAR,'ot',1,5819) @@ -883,7 +886,8 @@ LexToken(OPENBRACKET,'(',1,5855) LexToken(OPENSQBRACKET,'[',1,5856) LexToken(VAR,'out',1,5857) LexToken(COMMA,',',1,5860) -LexToken(NUMBER,'-1',1,5861) +LexToken(ADDITION,'-',1,5861) +LexToken(NUMBER,'1',1,5862) LexToken(CLOSESQBRACKET,']',1,5863) LexToken(COMMA,',',1,5864) LexToken(VAR,'ot',1,5865) @@ -915,9 +919,11 @@ LexToken(COMMA,',',1,5966) LexToken(VAR,'list',1,5995) LexToken(OPENBRACKET,'(',1,5999) LexToken(OPENSQBRACKET,'[',1,6000) -LexToken(NUMBER,'-1',1,6001) +LexToken(ADDITION,'-',1,6001) +LexToken(NUMBER,'1',1,6002) LexToken(COMMA,',',1,6003) -LexToken(NUMBER,'-2',1,6004) +LexToken(ADDITION,'-',1,6004) +LexToken(NUMBER,'2',1,6005) LexToken(CLOSESQBRACKET,']',1,6006) LexToken(COMMA,',',1,6007) LexToken(VAR,'ot',1,6008) @@ -926,9 +932,11 @@ LexToken(COMMA,',',1,6011) LexToken(VAR,'list',1,6040) LexToken(OPENBRACKET,'(',1,6044) LexToken(OPENSQBRACKET,'[',1,6045) -LexToken(NUMBER,'-1',1,6046) +LexToken(ADDITION,'-',1,6046) +LexToken(NUMBER,'1',1,6047) LexToken(COMMA,',',1,6048) -LexToken(NUMBER,'-2',1,6049) +LexToken(ADDITION,'-',1,6049) +LexToken(NUMBER,'2',1,6050) LexToken(CLOSESQBRACKET,']',1,6051) LexToken(COMMA,',',1,6052) LexToken(VAR,'ot',1,6053) @@ -986,19 +994,23 @@ LexToken(NUMBER,'1',1,6361) LexToken(EOL,'\n',1,6362) LexToken(VAR,'in',1,6371) LexToken(ASSIGNMENT,'=',1,6373) -LexToken(NUMBER,'-1',1,6374) +LexToken(ADDITION,'-',1,6374) +LexToken(NUMBER,'1',1,6375) LexToken(SEMICOLON,';',1,6376) LexToken(VAR,'out',1,6377) LexToken(ASSIGNMENT,'=',1,6380) -LexToken(NUMBER,'-1',1,6381) +LexToken(ADDITION,'-',1,6381) +LexToken(NUMBER,'1',1,6382) LexToken(EOL,'\n',1,6383) LexToken(VAR,'in2',1,6392) LexToken(ASSIGNMENT,'=',1,6395) -LexToken(NUMBER,'-2',1,6396) +LexToken(ADDITION,'-',1,6396) +LexToken(NUMBER,'2',1,6397) LexToken(SEMICOLON,';',1,6398) LexToken(VAR,'out2',1,6399) LexToken(ASSIGNMENT,'=',1,6403) -LexToken(NUMBER,'-2',1,6404) +LexToken(ADDITION,'-',1,6404) +LexToken(NUMBER,'2',1,6405) LexToken(EOL,'\n',1,6406) LexToken(VAR,'model',1,6415) LexToken(ASSIGNMENT,'=',1,6420) diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 29d3dbe7..0413ec8e 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -112,9 +112,11 @@ LexToken(OPENBRACKET,'(',1,1167) LexToken(DQSTRING,'"mat"',1,1172) LexToken(COMMA,',',1,1173) LexToken(OPENSQBRACKET,'[',1,1174) -LexToken(NUMBER,'-1',1,1175) +LexToken(ADDITION,'-',1,1175) +LexToken(NUMBER,'1',1,1176) LexToken(COMMA,',',1,1177) -LexToken(NUMBER,'-1',1,1178) +LexToken(ADDITION,'-',1,1178) +LexToken(NUMBER,'1',1,1179) LexToken(CLOSESQBRACKET,']',1,1180) LexToken(CLOSEBRACKET,')',1,1181) LexToken(COMMA,',',1,1182) diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 358fd4ad..9cf86416 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -112,9 +112,11 @@ LexToken(OPENBRACKET,'(',1,1164) LexToken(DQSTRING,'"mat"',1,1169) LexToken(COMMA,',',1,1170) LexToken(OPENSQBRACKET,'[',1,1171) -LexToken(NUMBER,'-1',1,1172) +LexToken(ADDITION,'-',1,1172) +LexToken(NUMBER,'1',1,1173) LexToken(COMMA,',',1,1174) -LexToken(NUMBER,'-1',1,1175) +LexToken(ADDITION,'-',1,1175) +LexToken(NUMBER,'1',1,1176) LexToken(CLOSESQBRACKET,']',1,1177) LexToken(CLOSEBRACKET,')',1,1178) LexToken(COMMA,',',1,1179) diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 907802a6..dbeecef4 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -127,7 +127,8 @@ LexToken(VAR,'list',1,1339) LexToken(OPENBRACKET,'(',1,1343) LexToken(DQSTRING,'"vec"',1,1348) LexToken(COMMA,',',1,1349) -LexToken(NUMBER,'-1',1,1350) +LexToken(ADDITION,'-',1,1350) +LexToken(NUMBER,'1',1,1351) LexToken(COMMA,',',1,1352) LexToken(DQSTRING,'"vec"',1,1357) LexToken(COMMA,',',1,1358) @@ -139,11 +140,13 @@ LexToken(NUMBER,'1',1,1367) LexToken(COMMA,',',1,1368) LexToken(DQSTRING,'"vec"',1,1373) LexToken(COMMA,',',1,1374) -LexToken(NUMBER,'-1',1,1375) +LexToken(ADDITION,'-',1,1375) +LexToken(NUMBER,'1',1,1376) LexToken(COMMA,',',1,1377) LexToken(DQSTRING,'"vec"',1,1382) LexToken(COMMA,',',1,1383) -LexToken(NUMBER,'-1',1,1384) +LexToken(ADDITION,'-',1,1384) +LexToken(NUMBER,'1',1,1385) LexToken(CLOSEBRACKET,')',1,1386) LexToken(COMMA,',',1,1387) LexToken(VAR,'exprs',1,1388) @@ -220,7 +223,7 @@ LexToken(EOL,'\n',1,1698) LexToken(VAR,'maxp',1,1719) LexToken(ASSIGNMENT,'=',1,1723) LexToken(VAR,'maxp',1,1724) -LexToken(OPERATOR,'*',1,1728) +LexToken(MULTIPLICATION,'*',1,1728) LexToken(VAR,'ones',1,1729) LexToken(OPENBRACKET,'(',1,1733) LexToken(VAR,'x0',1,1734) @@ -243,7 +246,7 @@ LexToken(EOL,'\n',1,1800) LexToken(VAR,'lowp',1,1821) LexToken(ASSIGNMENT,'=',1,1825) LexToken(VAR,'lowp',1,1826) -LexToken(OPERATOR,'*',1,1830) +LexToken(MULTIPLICATION,'*',1,1830) LexToken(VAR,'ones',1,1831) LexToken(OPENBRACKET,'(',1,1835) LexToken(VAR,'x0',1,1836) @@ -427,7 +430,7 @@ LexToken(VAR,'x0',1,2801) LexToken(COMMA,',',1,2803) LexToken(NUMBER,'1',1,2804) LexToken(CLOSEBRACKET,')',1,2805) -LexToken(OPERATOR,'*',1,2806) +LexToken(MULTIPLICATION,'*',1,2806) LexToken(OPENSQBRACKET,'[',1,2807) LexToken(NUMBER,'1',1,2808) LexToken(SEMICOLON,';',1,2809) @@ -498,7 +501,8 @@ LexToken(NUMBER,'1',1,3085) LexToken(SEMICOLON,';',1,3086) LexToken(VAR,'minp',1,3087) LexToken(ASSIGNMENT,'=',1,3091) -LexToken(NUMBER,'-1',1,3092) +LexToken(ADDITION,'-',1,3092) +LexToken(NUMBER,'1',1,3093) LexToken(SEMICOLON,';',1,3094) LexToken(VAR,'rpar',1,3095) LexToken(ASSIGNMENT,'=',1,3099) diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index fdc7051d..ad19c96f 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -128,8 +128,10 @@ LexToken(OPENBRACKET,'(',1,1347) LexToken(DQSTRING,'"mat"',1,1352) LexToken(COMMA,',',1,1353) LexToken(OPENSQBRACKET,'[',1,1354) -LexToken(NUMBER,'-1',1,1355) -LexToken(NUMBER,'-1',1,1358) +LexToken(ADDITION,'-',1,1355) +LexToken(NUMBER,'1',1,1356) +LexToken(ADDITION,'-',1,1358) +LexToken(NUMBER,'1',1,1359) LexToken(CLOSESQBRACKET,']',1,1360) LexToken(COMMA,',',1,1361) LexToken(DQSTRING,'"vec"',1,1366) @@ -143,15 +145,19 @@ LexToken(COMMA,',',1,1377) LexToken(DQSTRING,'"mat"',1,1382) LexToken(COMMA,',',1,1383) LexToken(OPENSQBRACKET,'[',1,1384) -LexToken(NUMBER,'-1',1,1385) -LexToken(NUMBER,'-1',1,1388) +LexToken(ADDITION,'-',1,1385) +LexToken(NUMBER,'1',1,1386) +LexToken(ADDITION,'-',1,1388) +LexToken(NUMBER,'1',1,1389) LexToken(CLOSESQBRACKET,']',1,1390) LexToken(COMMA,',',1,1391) LexToken(DQSTRING,'"mat"',1,1396) LexToken(COMMA,',',1,1397) LexToken(OPENSQBRACKET,'[',1,1398) -LexToken(NUMBER,'-1',1,1399) -LexToken(NUMBER,'-1',1,1402) +LexToken(ADDITION,'-',1,1399) +LexToken(NUMBER,'1',1,1400) +LexToken(ADDITION,'-',1,1402) +LexToken(NUMBER,'1',1,1403) LexToken(CLOSESQBRACKET,']',1,1404) LexToken(CLOSEBRACKET,')',1,1405) LexToken(COMMA,',',1,1406) @@ -234,7 +240,7 @@ LexToken(EOL,'\n',1,1805) LexToken(VAR,'maxp',1,1830) LexToken(ASSIGNMENT,'=',1,1834) LexToken(VAR,'maxp',1,1835) -LexToken(OPERATOR,'*',1,1839) +LexToken(MULTIPLICATION,'*',1,1839) LexToken(VAR,'ones',1,1840) LexToken(OPENBRACKET,'(',1,1844) LexToken(VAR,'x0',1,1845) @@ -257,7 +263,7 @@ LexToken(EOL,'\n',1,1919) LexToken(VAR,'lowp',1,1944) LexToken(ASSIGNMENT,'=',1,1948) LexToken(VAR,'lowp',1,1949) -LexToken(OPERATOR,'*',1,1953) +LexToken(MULTIPLICATION,'*',1,1953) LexToken(VAR,'ones',1,1954) LexToken(OPENBRACKET,'(',1,1958) LexToken(VAR,'x0',1,1959) @@ -410,17 +416,17 @@ LexToken(EOL,'\n',1,2796) LexToken(VAR,'maxp',1,2821) LexToken(ASSIGNMENT,'=',1,2825) LexToken(VAR,'maxp',1,2826) -LexToken(OPERATOR,'*',1,2830) +LexToken(MULTIPLICATION,'*',1,2830) LexToken(VAR,'ones',1,2831) LexToken(OPENBRACKET,'(',1,2835) LexToken(VAR,'x0',1,2836) LexToken(CLOSEBRACKET,')',1,2838) -LexToken(OPERATOR,'+',1,2839) +LexToken(ADDITION,'+',1,2839) LexToken(PREVAR_COMPLEX,'%i',1,2840) -LexToken(OPERATOR,'*',1,2842) +LexToken(MULTIPLICATION,'*',1,2842) LexToken(OPENBRACKET,'(',1,2843) LexToken(VAR,'maxp',1,2844) -LexToken(OPERATOR,'*',1,2848) +LexToken(MULTIPLICATION,'*',1,2848) LexToken(VAR,'ones',1,2849) LexToken(OPENBRACKET,'(',1,2853) LexToken(VAR,'x0',1,2854) @@ -444,17 +450,17 @@ LexToken(EOL,'\n',1,2929) LexToken(VAR,'lowp',1,2954) LexToken(ASSIGNMENT,'=',1,2958) LexToken(VAR,'lowp',1,2959) -LexToken(OPERATOR,'*',1,2963) +LexToken(MULTIPLICATION,'*',1,2963) LexToken(VAR,'ones',1,2964) LexToken(OPENBRACKET,'(',1,2968) LexToken(VAR,'x0',1,2969) LexToken(CLOSEBRACKET,')',1,2971) -LexToken(OPERATOR,'+',1,2972) +LexToken(ADDITION,'+',1,2972) LexToken(PREVAR_COMPLEX,'%i',1,2973) -LexToken(OPERATOR,'*',1,2975) +LexToken(MULTIPLICATION,'*',1,2975) LexToken(OPENBRACKET,'(',1,2976) LexToken(VAR,'lowp',1,2977) -LexToken(OPERATOR,'*',1,2981) +LexToken(MULTIPLICATION,'*',1,2981) LexToken(VAR,'ones',1,2982) LexToken(OPENBRACKET,'(',1,2986) LexToken(VAR,'x0',1,2987) @@ -640,7 +646,7 @@ LexToken(DOT,'.',1,3783) LexToken(VAR,'nzcross',1,3784) LexToken(ASSIGNMENT,'=',1,3791) LexToken(NUMBER,'2',1,3792) -LexToken(OPERATOR,'*',1,3793) +LexToken(MULTIPLICATION,'*',1,3793) LexToken(VAR,'size',1,3794) LexToken(OPENBRACKET,'(',1,3798) LexToken(VAR,'x0',1,3799) @@ -653,7 +659,7 @@ LexToken(DOT,'.',1,3836) LexToken(VAR,'nmode',1,3837) LexToken(ASSIGNMENT,'=',1,3842) LexToken(NUMBER,'2',1,3843) -LexToken(OPERATOR,'*',1,3844) +LexToken(MULTIPLICATION,'*',1,3844) LexToken(VAR,'size',1,3845) LexToken(OPENBRACKET,'(',1,3849) LexToken(VAR,'x0',1,3850) @@ -793,7 +799,7 @@ LexToken(OPENSQBRACKET,'[',1,4459) LexToken(NUMBER,'2',1,4460) LexToken(SEMICOLON,';',1,4461) LexToken(NUMBER,'2',1,4462) -LexToken(OPERATOR,'*',1,4463) +LexToken(MULTIPLICATION,'*',1,4463) LexToken(VAR,'ones',1,4464) LexToken(OPENBRACKET,'(',1,4468) LexToken(VAR,'reinit',1,4469) @@ -835,7 +841,7 @@ LexToken(VAR,'x0',1,4688) LexToken(COMMA,',',1,4690) LexToken(NUMBER,'1',1,4691) LexToken(CLOSEBRACKET,')',1,4692) -LexToken(OPERATOR,'*',1,4693) +LexToken(MULTIPLICATION,'*',1,4693) LexToken(OPENSQBRACKET,'[',1,4694) LexToken(NUMBER,'1',1,4695) LexToken(SEMICOLON,';',1,4696) @@ -853,7 +859,7 @@ LexToken(VAR,'x0',1,4718) LexToken(COMMA,',',1,4720) LexToken(NUMBER,'2',1,4721) LexToken(CLOSEBRACKET,')',1,4722) -LexToken(OPERATOR,'*',1,4723) +LexToken(MULTIPLICATION,'*',1,4723) LexToken(OPENSQBRACKET,'[',1,4724) LexToken(NUMBER,'1',1,4725) LexToken(SEMICOLON,';',1,4726) @@ -956,7 +962,8 @@ LexToken(SEMICOLON,';',1,5133) LexToken(EOL,'\n',1,5134) LexToken(VAR,'minp',1,5143) LexToken(ASSIGNMENT,'=',1,5147) -LexToken(NUMBER,'-1',1,5148) +LexToken(ADDITION,'-',1,5148) +LexToken(NUMBER,'1',1,5149) LexToken(SEMICOLON,';',1,5150) LexToken(EOL,'\n',1,5151) LexToken(VAR,'rpar',1,5160) diff --git a/js/Linear/PID.js b/js/Linear/PID.js index d0d93a18..4595c718 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -472,15 +472,18 @@ LexToken(VAR,'list',1,2631) LexToken(OPENBRACKET,'(',1,2635) LexToken(DQSTRING,'"vec"',1,2640) LexToken(COMMA,',',1,2641) -LexToken(NUMBER,'-1',1,2642) +LexToken(ADDITION,'-',1,2642) +LexToken(NUMBER,'1',1,2643) LexToken(COMMA,',',1,2644) LexToken(DQSTRING,'"vec"',1,2649) LexToken(COMMA,',',1,2650) -LexToken(NUMBER,'-1',1,2651) +LexToken(ADDITION,'-',1,2651) +LexToken(NUMBER,'1',1,2652) LexToken(COMMA,',',1,2653) LexToken(DQSTRING,'"vec"',1,2658) LexToken(COMMA,',',1,2659) -LexToken(NUMBER,'-1',1,2660) +LexToken(ADDITION,'-',1,2660) +LexToken(NUMBER,'1',1,2661) LexToken(CLOSEBRACKET,')',1,2662) LexToken(COMMA,',',1,2663) LexToken(VAR,'exprs',1,2664) @@ -638,7 +641,7 @@ LexToken(VAR,'size',1,3285) LexToken(OPENBRACKET,'(',1,3289) LexToken(VAR,'newpar',1,3290) LexToken(CLOSEBRACKET,')',1,3296) -LexToken(OPERATOR,'+',1,3297) +LexToken(ADDITION,'+',1,3297) LexToken(NUMBER,'1',1,3298) LexToken(CLOSEBRACKET,')',1,3299) LexToken(ASSIGNMENT,'=',1,3300) @@ -653,7 +656,7 @@ LexToken(VAR,'size',1,3329) LexToken(OPENBRACKET,'(',1,3333) LexToken(VAR,'newpar',1,3334) LexToken(CLOSEBRACKET,')',1,3340) -LexToken(OPERATOR,'+',1,3341) +LexToken(ADDITION,'+',1,3341) LexToken(NUMBER,'1',1,3342) LexToken(CLOSEBRACKET,')',1,3343) LexToken(ASSIGNMENT,'=',1,3344) @@ -668,7 +671,7 @@ LexToken(VAR,'size',1,3373) LexToken(OPENBRACKET,'(',1,3377) LexToken(VAR,'newpar',1,3378) LexToken(CLOSEBRACKET,')',1,3384) -LexToken(OPERATOR,'+',1,3385) +LexToken(ADDITION,'+',1,3385) LexToken(NUMBER,'1',1,3386) LexToken(CLOSEBRACKET,')',1,3387) LexToken(ASSIGNMENT,'=',1,3388) @@ -1171,21 +1174,27 @@ LexToken(COMMA,',',1,5409) LexToken(VAR,'in',1,5421) LexToken(ASSIGNMENT,'=',1,5423) LexToken(OPENSQBRACKET,'[',1,5424) -LexToken(NUMBER,'-1',1,5425) +LexToken(ADDITION,'-',1,5425) +LexToken(NUMBER,'1',1,5426) LexToken(SEMICOLON,';',1,5427) -LexToken(NUMBER,'-1',1,5428) +LexToken(ADDITION,'-',1,5428) +LexToken(NUMBER,'1',1,5429) LexToken(SEMICOLON,';',1,5430) -LexToken(NUMBER,'-1',1,5431) +LexToken(ADDITION,'-',1,5431) +LexToken(NUMBER,'1',1,5432) LexToken(CLOSESQBRACKET,']',1,5433) LexToken(COMMA,',',1,5434) LexToken(VAR,'in2',1,5446) LexToken(ASSIGNMENT,'=',1,5449) LexToken(OPENSQBRACKET,'[',1,5450) -LexToken(NUMBER,'-2',1,5451) +LexToken(ADDITION,'-',1,5451) +LexToken(NUMBER,'2',1,5452) LexToken(SEMICOLON,';',1,5453) -LexToken(NUMBER,'-2',1,5454) +LexToken(ADDITION,'-',1,5454) +LexToken(NUMBER,'2',1,5455) LexToken(SEMICOLON,';',1,5456) -LexToken(NUMBER,'-2',1,5457) +LexToken(ADDITION,'-',1,5457) +LexToken(NUMBER,'2',1,5458) LexToken(CLOSESQBRACKET,']',1,5459) LexToken(COMMA,',',1,5460) LexToken(VAR,'intyp',1,5472) @@ -1200,11 +1209,13 @@ LexToken(CLOSESQBRACKET,']',1,5484) LexToken(COMMA,',',1,5485) LexToken(VAR,'out',1,5497) LexToken(ASSIGNMENT,'=',1,5500) -LexToken(NUMBER,'-1',1,5501) +LexToken(ADDITION,'-',1,5501) +LexToken(NUMBER,'1',1,5502) LexToken(COMMA,',',1,5503) LexToken(VAR,'out2',1,5515) LexToken(ASSIGNMENT,'=',1,5519) -LexToken(NUMBER,'-2',1,5520) +LexToken(ADDITION,'-',1,5520) +LexToken(NUMBER,'2',1,5521) LexToken(COMMA,',',1,5522) LexToken(VAR,'outtyp',1,5534) LexToken(ASSIGNMENT,'=',1,5540) @@ -1396,11 +1407,13 @@ LexToken(CLOSEBRACKET,')',1,6345) LexToken(COMMA,',',1,6346) LexToken(VAR,'in',1,6358) LexToken(ASSIGNMENT,'=',1,6360) -LexToken(NUMBER,'-1',1,6361) +LexToken(ADDITION,'-',1,6361) +LexToken(NUMBER,'1',1,6362) LexToken(COMMA,',',1,6363) LexToken(VAR,'in2',1,6375) LexToken(ASSIGNMENT,'=',1,6378) -LexToken(NUMBER,'-2',1,6379) +LexToken(ADDITION,'-',1,6379) +LexToken(NUMBER,'2',1,6380) LexToken(COMMA,',',1,6381) LexToken(VAR,'intyp',1,6393) LexToken(ASSIGNMENT,'=',1,6398) @@ -1408,11 +1421,13 @@ LexToken(NUMBER,'1',1,6399) LexToken(COMMA,',',1,6400) LexToken(VAR,'out',1,6412) LexToken(ASSIGNMENT,'=',1,6415) -LexToken(NUMBER,'-1',1,6416) +LexToken(ADDITION,'-',1,6416) +LexToken(NUMBER,'1',1,6417) LexToken(COMMA,',',1,6418) LexToken(VAR,'out2',1,6430) LexToken(ASSIGNMENT,'=',1,6434) -LexToken(NUMBER,'-2',1,6435) +LexToken(ADDITION,'-',1,6435) +LexToken(NUMBER,'2',1,6436) LexToken(COMMA,',',1,6437) LexToken(VAR,'outtyp',1,6449) LexToken(ASSIGNMENT,'=',1,6455) @@ -1599,11 +1614,13 @@ LexToken(CLOSEBRACKET,')',1,7249) LexToken(COMMA,',',1,7250) LexToken(VAR,'in',1,7262) LexToken(ASSIGNMENT,'=',1,7264) -LexToken(NUMBER,'-1',1,7265) +LexToken(ADDITION,'-',1,7265) +LexToken(NUMBER,'1',1,7266) LexToken(COMMA,',',1,7267) LexToken(VAR,'in2',1,7279) LexToken(ASSIGNMENT,'=',1,7282) -LexToken(NUMBER,'-2',1,7283) +LexToken(ADDITION,'-',1,7283) +LexToken(NUMBER,'2',1,7284) LexToken(COMMA,',',1,7285) LexToken(VAR,'intyp',1,7297) LexToken(ASSIGNMENT,'=',1,7302) @@ -1611,11 +1628,13 @@ LexToken(NUMBER,'1',1,7303) LexToken(COMMA,',',1,7304) LexToken(VAR,'out',1,7316) LexToken(ASSIGNMENT,'=',1,7319) -LexToken(NUMBER,'-1',1,7320) +LexToken(ADDITION,'-',1,7320) +LexToken(NUMBER,'1',1,7321) LexToken(COMMA,',',1,7322) LexToken(VAR,'out2',1,7334) LexToken(ASSIGNMENT,'=',1,7338) -LexToken(NUMBER,'-2',1,7339) +LexToken(ADDITION,'-',1,7339) +LexToken(NUMBER,'2',1,7340) LexToken(COMMA,',',1,7341) LexToken(VAR,'outtyp',1,7353) LexToken(ASSIGNMENT,'=',1,7359) @@ -1802,11 +1821,13 @@ LexToken(CLOSEBRACKET,')',1,8158) LexToken(COMMA,',',1,8159) LexToken(VAR,'in',1,8171) LexToken(ASSIGNMENT,'=',1,8173) -LexToken(NUMBER,'-1',1,8174) +LexToken(ADDITION,'-',1,8174) +LexToken(NUMBER,'1',1,8175) LexToken(COMMA,',',1,8176) LexToken(VAR,'in2',1,8188) LexToken(ASSIGNMENT,'=',1,8191) -LexToken(NUMBER,'-2',1,8192) +LexToken(ADDITION,'-',1,8192) +LexToken(NUMBER,'2',1,8193) LexToken(COMMA,',',1,8194) LexToken(VAR,'intyp',1,8206) LexToken(ASSIGNMENT,'=',1,8211) @@ -1814,11 +1835,13 @@ LexToken(NUMBER,'1',1,8212) LexToken(COMMA,',',1,8213) LexToken(VAR,'out',1,8225) LexToken(ASSIGNMENT,'=',1,8228) -LexToken(NUMBER,'-1',1,8229) +LexToken(ADDITION,'-',1,8229) +LexToken(NUMBER,'1',1,8230) LexToken(COMMA,',',1,8231) LexToken(VAR,'out2',1,8243) LexToken(ASSIGNMENT,'=',1,8247) -LexToken(NUMBER,'-2',1,8248) +LexToken(ADDITION,'-',1,8248) +LexToken(NUMBER,'2',1,8249) LexToken(COMMA,',',1,8250) LexToken(VAR,'outtyp',1,8262) LexToken(ASSIGNMENT,'=',1,8268) @@ -2004,11 +2027,13 @@ LexToken(CLOSEBRACKET,')',1,9066) LexToken(COMMA,',',1,9067) LexToken(VAR,'in',1,9079) LexToken(ASSIGNMENT,'=',1,9081) -LexToken(NUMBER,'-1',1,9082) +LexToken(ADDITION,'-',1,9082) +LexToken(NUMBER,'1',1,9083) LexToken(COMMA,',',1,9084) LexToken(VAR,'in2',1,9096) LexToken(ASSIGNMENT,'=',1,9099) -LexToken(NUMBER,'-2',1,9100) +LexToken(ADDITION,'-',1,9100) +LexToken(NUMBER,'2',1,9101) LexToken(COMMA,',',1,9102) LexToken(VAR,'intyp',1,9114) LexToken(ASSIGNMENT,'=',1,9119) @@ -2016,11 +2041,13 @@ LexToken(NUMBER,'1',1,9120) LexToken(COMMA,',',1,9121) LexToken(VAR,'out',1,9133) LexToken(ASSIGNMENT,'=',1,9136) -LexToken(NUMBER,'-1',1,9137) +LexToken(ADDITION,'-',1,9137) +LexToken(NUMBER,'1',1,9138) LexToken(COMMA,',',1,9139) LexToken(VAR,'out2',1,9151) LexToken(ASSIGNMENT,'=',1,9155) -LexToken(NUMBER,'-2',1,9156) +LexToken(ADDITION,'-',1,9156) +LexToken(NUMBER,'2',1,9157) LexToken(COMMA,',',1,9158) LexToken(VAR,'outtyp',1,9170) LexToken(ASSIGNMENT,'=',1,9176) @@ -2550,7 +2577,8 @@ LexToken(DQSTRING,'"lsplit"',1,11139) LexToken(COMMA,',',1,11140) LexToken(VAR,'in',1,11152) LexToken(ASSIGNMENT,'=',1,11154) -LexToken(NUMBER,'-1',1,11155) +LexToken(ADDITION,'-',1,11155) +LexToken(NUMBER,'1',1,11156) LexToken(COMMA,',',1,11157) LexToken(VAR,'in2',1,11169) LexToken(ASSIGNMENT,'=',1,11172) @@ -2564,11 +2592,14 @@ LexToken(COMMA,',',1,11194) LexToken(VAR,'out',1,11206) LexToken(ASSIGNMENT,'=',1,11209) LexToken(OPENSQBRACKET,'[',1,11210) -LexToken(NUMBER,'-1',1,11211) +LexToken(ADDITION,'-',1,11211) +LexToken(NUMBER,'1',1,11212) LexToken(SEMICOLON,';',1,11213) -LexToken(NUMBER,'-1',1,11214) +LexToken(ADDITION,'-',1,11214) +LexToken(NUMBER,'1',1,11215) LexToken(SEMICOLON,';',1,11216) -LexToken(NUMBER,'-1',1,11217) +LexToken(ADDITION,'-',1,11217) +LexToken(NUMBER,'1',1,11218) LexToken(CLOSESQBRACKET,']',1,11219) LexToken(COMMA,',',1,11220) LexToken(VAR,'out2',1,11232) @@ -2903,7 +2934,8 @@ LexToken(DQSTRING,'"lsplit"',1,12535) LexToken(COMMA,',',1,12536) LexToken(VAR,'in',1,12548) LexToken(ASSIGNMENT,'=',1,12550) -LexToken(NUMBER,'-1',1,12551) +LexToken(ADDITION,'-',1,12551) +LexToken(NUMBER,'1',1,12552) LexToken(COMMA,',',1,12553) LexToken(VAR,'in2',1,12565) LexToken(ASSIGNMENT,'=',1,12568) @@ -2917,11 +2949,14 @@ LexToken(COMMA,',',1,12590) LexToken(VAR,'out',1,12602) LexToken(ASSIGNMENT,'=',1,12605) LexToken(OPENSQBRACKET,'[',1,12606) -LexToken(NUMBER,'-1',1,12607) +LexToken(ADDITION,'-',1,12607) +LexToken(NUMBER,'1',1,12608) LexToken(SEMICOLON,';',1,12609) -LexToken(NUMBER,'-1',1,12610) +LexToken(ADDITION,'-',1,12610) +LexToken(NUMBER,'1',1,12611) LexToken(SEMICOLON,';',1,12612) -LexToken(NUMBER,'-1',1,12613) +LexToken(ADDITION,'-',1,12613) +LexToken(NUMBER,'1',1,12614) LexToken(CLOSESQBRACKET,']',1,12615) LexToken(COMMA,',',1,12616) LexToken(VAR,'out2',1,12628) @@ -3247,7 +3282,8 @@ LexToken(DQSTRING,'"output"',1,13905) LexToken(COMMA,',',1,13906) LexToken(VAR,'in',1,13918) LexToken(ASSIGNMENT,'=',1,13920) -LexToken(NUMBER,'-1',1,13921) +LexToken(ADDITION,'-',1,13921) +LexToken(NUMBER,'1',1,13922) LexToken(COMMA,',',1,13923) LexToken(VAR,'in2',1,13935) LexToken(ASSIGNMENT,'=',1,13938) @@ -3256,7 +3292,8 @@ LexToken(CLOSESQBRACKET,']',1,13940) LexToken(COMMA,',',1,13941) LexToken(VAR,'intyp',1,13953) LexToken(ASSIGNMENT,'=',1,13958) -LexToken(NUMBER,'-1',1,13959) +LexToken(ADDITION,'-',1,13959) +LexToken(NUMBER,'1',1,13960) LexToken(COMMA,',',1,13961) LexToken(VAR,'out',1,13973) LexToken(ASSIGNMENT,'=',1,13976) @@ -3529,7 +3566,8 @@ LexToken(NUMBER,'1',1,15077) LexToken(COMMA,',',1,15078) LexToken(VAR,'out',1,15090) LexToken(ASSIGNMENT,'=',1,15093) -LexToken(NUMBER,'-1',1,15094) +LexToken(ADDITION,'-',1,15094) +LexToken(NUMBER,'1',1,15095) LexToken(COMMA,',',1,15096) LexToken(VAR,'out2',1,15108) LexToken(ASSIGNMENT,'=',1,15112) @@ -3538,7 +3576,8 @@ LexToken(CLOSESQBRACKET,']',1,15114) LexToken(COMMA,',',1,15115) LexToken(VAR,'outtyp',1,15127) LexToken(ASSIGNMENT,'=',1,15133) -LexToken(NUMBER,'-1',1,15134) +LexToken(ADDITION,'-',1,15134) +LexToken(NUMBER,'1',1,15135) LexToken(COMMA,',',1,15136) LexToken(VAR,'evtin',1,15148) LexToken(ASSIGNMENT,'=',1,15153) @@ -3707,25 +3746,29 @@ LexToken(VAR,'model',1,15778) LexToken(DOT,'.',1,15783) LexToken(VAR,'in',1,15784) LexToken(ASSIGNMENT,'=',1,15786) -LexToken(NUMBER,'-1',1,15787) +LexToken(ADDITION,'-',1,15787) +LexToken(NUMBER,'1',1,15788) LexToken(EOL,'\n',1,15789) LexToken(VAR,'model',1,15798) LexToken(DOT,'.',1,15803) LexToken(VAR,'in2',1,15804) LexToken(ASSIGNMENT,'=',1,15807) -LexToken(NUMBER,'-2',1,15808) +LexToken(ADDITION,'-',1,15808) +LexToken(NUMBER,'2',1,15809) LexToken(EOL,'\n',1,15810) LexToken(VAR,'model',1,15819) LexToken(DOT,'.',1,15824) LexToken(VAR,'out',1,15825) LexToken(ASSIGNMENT,'=',1,15828) -LexToken(NUMBER,'-1',1,15829) +LexToken(ADDITION,'-',1,15829) +LexToken(NUMBER,'1',1,15830) LexToken(EOL,'\n',1,15831) LexToken(VAR,'model',1,15840) LexToken(DOT,'.',1,15845) LexToken(VAR,'out2',1,15846) LexToken(ASSIGNMENT,'=',1,15850) -LexToken(NUMBER,'-2',1,15851) +LexToken(ADDITION,'-',1,15851) +LexToken(NUMBER,'2',1,15852) LexToken(EOL,'\n',1,15853) LexToken(VAR,'model',1,15862) LexToken(DOT,'.',1,15867) diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 33d4afa5..de09c506 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -140,7 +140,8 @@ LexToken(VAR,'list',1,1327) LexToken(OPENBRACKET,'(',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) diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index dbb8c832..126a0cbc 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -109,7 +109,8 @@ LexToken(VAR,'list',1,1177) LexToken(OPENBRACKET,'(',1,1181) LexToken(DQSTRING,'"vec"',1,1186) LexToken(COMMA,',',1,1187) -LexToken(NUMBER,'-1',1,1188) +LexToken(ADDITION,'-',1,1188) +LexToken(NUMBER,'1',1,1189) LexToken(CLOSEBRACKET,')',1,1190) LexToken(COMMA,',',1,1191) LexToken(VAR,'exprs',1,1192) diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index c6ed66be..33f35345 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -82,7 +82,8 @@ LexToken(THEN,'then',1,1019) LexToken(EOL,'\n',1,1023) LexToken(VAR,'in',1,1032) LexToken(ASSIGNMENT,'=',1,1034) -LexToken(NUMBER,'-1',1,1035) +LexToken(ADDITION,'-',1,1035) +LexToken(NUMBER,'1',1,1036) LexToken(EOL,'\n',1,1037) LexToken(VAR,'model',1,1046) LexToken(ASSIGNMENT,'=',1,1051) @@ -105,13 +106,15 @@ LexToken(VAR,'model',1,1113) LexToken(DOT,'.',1,1118) LexToken(VAR,'in',1,1119) LexToken(ASSIGNMENT,'=',1,1121) -LexToken(NUMBER,'-1',1,1122) +LexToken(ADDITION,'-',1,1122) +LexToken(NUMBER,'1',1,1123) LexToken(EOL,'\n',1,1124) LexToken(VAR,'model',1,1133) LexToken(DOT,'.',1,1138) LexToken(VAR,'out',1,1139) LexToken(ASSIGNMENT,'=',1,1142) -LexToken(NUMBER,'-1',1,1143) +LexToken(ADDITION,'-',1,1143) +LexToken(NUMBER,'1',1,1144) LexToken(EOL,'\n',1,1145) LexToken(VAR,'model',1,1154) LexToken(DOT,'.',1,1159) diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index f0328cd9..c12dc039 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -277,13 +277,15 @@ LexToken(VAR,'model',1,1958) LexToken(DOT,'.',1,1963) LexToken(VAR,'in',1,1964) LexToken(ASSIGNMENT,'=',1,1966) -LexToken(NUMBER,'-1',1,1967) +LexToken(ADDITION,'-',1,1967) +LexToken(NUMBER,'1',1,1968) LexToken(EOL,'\n',1,1969) LexToken(VAR,'model',1,1978) LexToken(DOT,'.',1,1983) LexToken(VAR,'in2',1,1984) LexToken(ASSIGNMENT,'=',1,1987) -LexToken(NUMBER,'-2',1,1988) +LexToken(ADDITION,'-',1,1988) +LexToken(NUMBER,'2',1,1989) LexToken(EOL,'\n',1,1990) LexToken(VAR,'model',1,1999) LexToken(DOT,'.',1,2004) @@ -301,13 +303,15 @@ LexToken(VAR,'model',1,2044) LexToken(DOT,'.',1,2049) LexToken(VAR,'out',1,2050) LexToken(ASSIGNMENT,'=',1,2053) -LexToken(NUMBER,'-1',1,2054) +LexToken(ADDITION,'-',1,2054) +LexToken(NUMBER,'1',1,2055) LexToken(EOL,'\n',1,2056) LexToken(VAR,'model',1,2065) LexToken(DOT,'.',1,2070) LexToken(VAR,'out2',1,2071) LexToken(ASSIGNMENT,'=',1,2075) -LexToken(NUMBER,'-2',1,2076) +LexToken(ADDITION,'-',1,2076) +LexToken(NUMBER,'2',1,2077) LexToken(EOL,'\n',1,2078) LexToken(VAR,'model',1,2087) LexToken(DOT,'.',1,2092) diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 7a4dabeb..d5c4ee77 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -82,7 +82,8 @@ LexToken(THEN,'then',1,1023) LexToken(EOL,'\n',1,1027) LexToken(VAR,'in',1,1036) LexToken(ASSIGNMENT,'=',1,1038) -LexToken(NUMBER,'-1',1,1039) +LexToken(ADDITION,'-',1,1039) +LexToken(NUMBER,'1',1,1040) LexToken(EOL,'\n',1,1041) LexToken(VAR,'model',1,1050) LexToken(ASSIGNMENT,'=',1,1055) @@ -100,13 +101,15 @@ LexToken(VAR,'model',1,1108) LexToken(DOT,'.',1,1113) LexToken(VAR,'in',1,1114) LexToken(ASSIGNMENT,'=',1,1116) -LexToken(NUMBER,'-1',1,1117) +LexToken(ADDITION,'-',1,1117) +LexToken(NUMBER,'1',1,1118) LexToken(EOL,'\n',1,1119) LexToken(VAR,'model',1,1128) LexToken(DOT,'.',1,1133) LexToken(VAR,'out',1,1134) LexToken(ASSIGNMENT,'=',1,1137) -LexToken(NUMBER,'-1',1,1138) +LexToken(ADDITION,'-',1,1138) +LexToken(NUMBER,'1',1,1139) LexToken(EOL,'\n',1,1140) LexToken(VAR,'model',1,1149) LexToken(DOT,'.',1,1154) diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index a26e23a7..cdf70113 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -197,7 +197,7 @@ LexToken(NUMBER,'1',1,1681) LexToken(COLON,':',1,1682) LexToken(NUMBER,'7',1,1683) LexToken(CLOSEBRACKET,')',1,1684) -LexToken(OPERATOR,'+',1,1685) +LexToken(ADDITION,'+',1,1685) LexToken(VAR,'exprs',1,1686) LexToken(OPENBRACKET,'(',1,1691) LexToken(COLON,':',1,1692) @@ -250,18 +250,22 @@ LexToken(DOT,'.',1,1839) LexToken(VAR,'in',1,1840) LexToken(ASSIGNMENT,'=',1,1842) LexToken(OPENSQBRACKET,'[',1,1843) -LexToken(NUMBER,'-1',1,1844) +LexToken(ADDITION,'-',1,1844) +LexToken(NUMBER,'1',1,1845) LexToken(SEMICOLON,';',1,1846) -LexToken(NUMBER,'-1',1,1847) +LexToken(ADDITION,'-',1,1847) +LexToken(NUMBER,'1',1,1848) LexToken(SEMICOLON,';',1,1849) -LexToken(NUMBER,'-1',1,1850) +LexToken(ADDITION,'-',1,1850) +LexToken(NUMBER,'1',1,1851) LexToken(CLOSESQBRACKET,']',1,1852) LexToken(EOL,'\n',1,1853) LexToken(VAR,'model',1,1862) LexToken(DOT,'.',1,1867) LexToken(VAR,'out',1,1868) LexToken(ASSIGNMENT,'=',1,1871) -LexToken(NUMBER,'-1',1,1872) +LexToken(ADDITION,'-',1,1872) +LexToken(NUMBER,'1',1,1873) LexToken(EOL,'\n',1,1874) LexToken(VAR,'model',1,1883) LexToken(DOT,'.',1,1888) diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 0a9c7145..01546f98 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -174,7 +174,8 @@ LexToken(NUMBER,'1',1,1535) LexToken(COMMA,',',1,1536) LexToken(DQSTRING,'"vec"',1,1541) LexToken(COMMA,',',1,1542) -LexToken(NUMBER,'-1',1,1543) +LexToken(ADDITION,'-',1,1543) +LexToken(NUMBER,'1',1,1544) LexToken(COMMA,',',1,1545) LexToken(DQSTRING,'"vec"',1,1550) LexToken(COMMA,',',1,1551) @@ -265,11 +266,13 @@ LexToken(THEN,'then',1,1975) LexToken(EOL,'\n',1,1979) LexToken(VAR,'in',1,2000) LexToken(ASSIGNMENT,'=',1,2002) -LexToken(NUMBER,'-1',1,2003) +LexToken(ADDITION,'-',1,2003) +LexToken(NUMBER,'1',1,2004) LexToken(SEMICOLON,';',1,2005) LexToken(VAR,'in2',1,2006) LexToken(ASSIGNMENT,'=',1,2009) -LexToken(NUMBER,'-2',1,2010) +LexToken(ADDITION,'-',1,2010) +LexToken(NUMBER,'2',1,2011) LexToken(EOL,'\n',1,2012) LexToken(VAR,'sgn',1,2033) LexToken(ASSIGNMENT,'=',1,2036) @@ -288,7 +291,7 @@ LexToken(ELSE,'else',1,2091) LexToken(EOL,'\n',1,2095) LexToken(VAR,'in',1,2116) LexToken(ASSIGNMENT,'=',1,2118) -LexToken(OPERATOR,'-',1,2119) +LexToken(ADDITION,'-',1,2119) LexToken(VAR,'ones',1,2120) LexToken(OPENBRACKET,'(',1,2124) LexToken(VAR,'sgn',1,2125) @@ -300,7 +303,7 @@ LexToken(EOL,'\n',1,2132) LexToken(VAR,'in2',1,2153) LexToken(ASSIGNMENT,'=',1,2156) LexToken(NUMBER,'2',1,2157) -LexToken(OPERATOR,'*',1,2158) +LexToken(MULTIPLICATION,'*',1,2158) LexToken(VAR,'in',1,2159) LexToken(EOL,'\n',1,2161) LexToken(VAR,'sgn',1,2182) @@ -314,11 +317,13 @@ LexToken(CLOSEBRACKET,')',1,2196) LexToken(EOL,'\n',1,2197) LexToken(VAR,'nout',1,2218) LexToken(ASSIGNMENT,'=',1,2222) -LexToken(NUMBER,'-1',1,2223) +LexToken(ADDITION,'-',1,2223) +LexToken(NUMBER,'1',1,2224) LexToken(SEMICOLON,';',1,2225) LexToken(VAR,'nout2',1,2226) LexToken(ASSIGNMENT,'=',1,2231) -LexToken(NUMBER,'-2',1,2232) +LexToken(ADDITION,'-',1,2232) +LexToken(NUMBER,'2',1,2233) LexToken(EOL,'\n',1,2234) LexToken(END,'end',1,2251) LexToken(EOL,'\n',1,2254) @@ -350,7 +355,7 @@ LexToken(ELSE,'else',1,2414) LexToken(EOL,'\n',1,2418) LexToken(VAR,'in',1,2439) LexToken(ASSIGNMENT,'=',1,2441) -LexToken(OPERATOR,'-',1,2442) +LexToken(ADDITION,'-',1,2442) LexToken(VAR,'ones',1,2443) LexToken(OPENBRACKET,'(',1,2447) LexToken(VAR,'size',1,2448) @@ -367,16 +372,18 @@ LexToken(EOL,'\n',1,2463) LexToken(VAR,'in2',1,2484) LexToken(ASSIGNMENT,'=',1,2487) LexToken(NUMBER,'2',1,2488) -LexToken(OPERATOR,'*',1,2489) +LexToken(MULTIPLICATION,'*',1,2489) LexToken(VAR,'in',1,2490) LexToken(EOL,'\n',1,2492) LexToken(VAR,'nout',1,2513) LexToken(ASSIGNMENT,'=',1,2517) -LexToken(NUMBER,'-1',1,2518) +LexToken(ADDITION,'-',1,2518) +LexToken(NUMBER,'1',1,2519) LexToken(SEMICOLON,';',1,2520) LexToken(VAR,'nout2',1,2521) LexToken(ASSIGNMENT,'=',1,2526) -LexToken(NUMBER,'-2',1,2527) +LexToken(ADDITION,'-',1,2527) +LexToken(NUMBER,'2',1,2528) LexToken(EOL,'\n',1,2529) LexToken(END,'end',1,2546) LexToken(EOL,'\n',1,2549) @@ -385,7 +392,7 @@ LexToken(EOL,'\n',1,2565) LexToken(VAR,'it',1,2578) LexToken(ASSIGNMENT,'=',1,2580) LexToken(VAR,'Datatype',1,2581) -LexToken(OPERATOR,'*',1,2589) +LexToken(MULTIPLICATION,'*',1,2589) LexToken(VAR,'ones',1,2590) LexToken(OPENBRACKET,'(',1,2594) LexToken(NUMBER,'1',1,2595) @@ -900,7 +907,8 @@ LexToken(ASSIGNMENT,'=',1,5447) LexToken(OPENSQBRACKET,'[',1,5448) LexToken(NUMBER,'1',1,5449) LexToken(SEMICOLON,';',1,5450) -LexToken(NUMBER,'-1',1,5451) +LexToken(ADDITION,'-',1,5451) +LexToken(NUMBER,'1',1,5452) LexToken(CLOSESQBRACKET,']',1,5453) LexToken(EOL,'\n',1,5454) LexToken(VAR,'model',1,5463) @@ -925,32 +933,38 @@ LexToken(DOT,'.',1,5535) LexToken(VAR,'in',1,5536) LexToken(ASSIGNMENT,'=',1,5538) LexToken(OPENSQBRACKET,'[',1,5539) -LexToken(NUMBER,'-1',1,5540) +LexToken(ADDITION,'-',1,5540) +LexToken(NUMBER,'1',1,5541) LexToken(SEMICOLON,';',1,5542) -LexToken(NUMBER,'-1',1,5543) +LexToken(ADDITION,'-',1,5543) +LexToken(NUMBER,'1',1,5544) LexToken(CLOSESQBRACKET,']',1,5545) LexToken(EOL,'\n',1,5546) LexToken(VAR,'model',1,5555) LexToken(DOT,'.',1,5560) LexToken(VAR,'out',1,5561) LexToken(ASSIGNMENT,'=',1,5564) -LexToken(NUMBER,'-1',1,5565) +LexToken(ADDITION,'-',1,5565) +LexToken(NUMBER,'1',1,5566) LexToken(EOL,'\n',1,5567) LexToken(VAR,'model',1,5576) LexToken(DOT,'.',1,5581) LexToken(VAR,'in2',1,5582) LexToken(ASSIGNMENT,'=',1,5585) LexToken(OPENSQBRACKET,'[',1,5586) -LexToken(NUMBER,'-2',1,5587) +LexToken(ADDITION,'-',1,5587) +LexToken(NUMBER,'2',1,5588) LexToken(SEMICOLON,';',1,5589) -LexToken(NUMBER,'-2',1,5590) +LexToken(ADDITION,'-',1,5590) +LexToken(NUMBER,'2',1,5591) LexToken(CLOSESQBRACKET,']',1,5592) LexToken(EOL,'\n',1,5593) LexToken(VAR,'model',1,5602) LexToken(DOT,'.',1,5607) LexToken(VAR,'out2',1,5608) LexToken(ASSIGNMENT,'=',1,5612) -LexToken(NUMBER,'-2',1,5613) +LexToken(ADDITION,'-',1,5613) +LexToken(NUMBER,'2',1,5614) LexToken(EOL,'\n',1,5615) LexToken(VAR,'model',1,5624) LexToken(DOT,'.',1,5629) diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index daeb82b1..b46b9f72 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -97,18 +97,22 @@ LexToken(DOT,'.',1,1085) LexToken(VAR,'in',1,1086) LexToken(ASSIGNMENT,'=',1,1088) LexToken(OPENSQBRACKET,'[',1,1089) -LexToken(NUMBER,'-1',1,1090) +LexToken(ADDITION,'-',1,1090) +LexToken(NUMBER,'1',1,1091) LexToken(SEMICOLON,';',1,1092) -LexToken(NUMBER,'-1',1,1093) +LexToken(ADDITION,'-',1,1093) +LexToken(NUMBER,'1',1,1094) LexToken(SEMICOLON,';',1,1095) -LexToken(NUMBER,'-1',1,1096) +LexToken(ADDITION,'-',1,1096) +LexToken(NUMBER,'1',1,1097) LexToken(CLOSESQBRACKET,']',1,1098) LexToken(EOL,'\n',1,1099) LexToken(VAR,'model',1,1108) LexToken(DOT,'.',1,1113) LexToken(VAR,'out',1,1114) LexToken(ASSIGNMENT,'=',1,1117) -LexToken(NUMBER,'-1',1,1118) +LexToken(ADDITION,'-',1,1118) +LexToken(NUMBER,'1',1,1119) LexToken(EOL,'\n',1,1120) LexToken(VAR,'model',1,1129) LexToken(DOT,'.',1,1134) diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index e861d6e7..30697151 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -154,9 +154,11 @@ LexToken(OPENBRACKET,'(',1,1399) LexToken(DQSTRING,'"mat"',1,1404) LexToken(COMMA,',',1,1405) LexToken(OPENSQBRACKET,'[',1,1406) -LexToken(NUMBER,'-1',1,1407) +LexToken(ADDITION,'-',1,1407) +LexToken(NUMBER,'1',1,1408) LexToken(COMMA,',',1,1409) -LexToken(NUMBER,'-1',1,1410) +LexToken(ADDITION,'-',1,1410) +LexToken(NUMBER,'1',1,1411) LexToken(CLOSESQBRACKET,']',1,1412) LexToken(COMMA,',',1,1413) LexToken(DQSTRING,'"mat"',1,1433) @@ -178,8 +180,10 @@ LexToken(COMMA,',',1,1495) LexToken(DQSTRING,'"mat"',1,1515) LexToken(COMMA,',',1,1516) LexToken(OPENSQBRACKET,'[',1,1517) -LexToken(NUMBER,'-1',1,1518) -LexToken(NUMBER,'-1',1,1521) +LexToken(ADDITION,'-',1,1518) +LexToken(NUMBER,'1',1,1519) +LexToken(ADDITION,'-',1,1521) +LexToken(NUMBER,'1',1,1522) LexToken(CLOSESQBRACKET,']',1,1523) LexToken(COMMA,',',1,1524) LexToken(DQSTRING,'"vec"',1,1544) diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index e9902569..90755b74 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -154,9 +154,11 @@ LexToken(OPENBRACKET,'(',1,1401) LexToken(DQSTRING,'"mat"',1,1406) LexToken(COMMA,',',1,1407) LexToken(OPENSQBRACKET,'[',1,1408) -LexToken(NUMBER,'-1',1,1409) +LexToken(ADDITION,'-',1,1409) +LexToken(NUMBER,'1',1,1410) LexToken(COMMA,',',1,1411) -LexToken(NUMBER,'-1',1,1412) +LexToken(ADDITION,'-',1,1412) +LexToken(NUMBER,'1',1,1413) LexToken(CLOSESQBRACKET,']',1,1414) LexToken(COMMA,',',1,1415) LexToken(DQSTRING,'"mat"',1,1435) @@ -178,8 +180,10 @@ LexToken(COMMA,',',1,1497) LexToken(DQSTRING,'"mat"',1,1517) LexToken(COMMA,',',1,1518) LexToken(OPENSQBRACKET,'[',1,1519) -LexToken(NUMBER,'-1',1,1520) -LexToken(NUMBER,'-1',1,1523) +LexToken(ADDITION,'-',1,1520) +LexToken(NUMBER,'1',1,1521) +LexToken(ADDITION,'-',1,1523) +LexToken(NUMBER,'1',1,1524) LexToken(CLOSESQBRACKET,']',1,1525) LexToken(COMMA,',',1,1526) LexToken(DQSTRING,'"vec"',1,1546) diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 8cac7b9a..d5534df5 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -208,10 +208,12 @@ LexToken(COMMA,',',1,1655) LexToken(VAR,'graphics',1,1656) LexToken(COMMA,',',1,1664) LexToken(OPENSQBRACKET,'[',1,1665) -LexToken(NUMBER,'-1',1,1666) +LexToken(ADDITION,'-',1,1666) +LexToken(NUMBER,'1',1,1667) LexToken(CLOSESQBRACKET,']',1,1668) LexToken(COMMA,',',1,1669) -LexToken(NUMBER,'-1',1,1670) +LexToken(ADDITION,'-',1,1670) +LexToken(NUMBER,'1',1,1671) LexToken(COMMA,',',1,1672) LexToken(OPENSQBRACKET,'[',1,1673) LexToken(CLOSESQBRACKET,']',1,1674) diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 11ce3f2f..fb586d6e 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -207,12 +207,14 @@ LexToken(COMMA,',',1,1654) LexToken(VAR,'graphics',1,1655) LexToken(COMMA,',',1,1663) LexToken(OPENSQBRACKET,'[',1,1664) -LexToken(NUMBER,'-1',1,1665) +LexToken(ADDITION,'-',1,1665) +LexToken(NUMBER,'1',1,1666) LexToken(SEMICOLON,';',1,1667) LexToken(NUMBER,'1',1,1668) LexToken(CLOSESQBRACKET,']',1,1669) LexToken(COMMA,',',1,1670) -LexToken(NUMBER,'-1',1,1671) +LexToken(ADDITION,'-',1,1671) +LexToken(NUMBER,'1',1,1672) LexToken(COMMA,',',1,1673) LexToken(OPENSQBRACKET,'[',1,1674) LexToken(CLOSESQBRACKET,']',1,1675) -- cgit