diff options
Diffstat (limited to 'js')
236 files changed, 8139 insertions, 6666 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index ded3a727..c9e8640a 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -106,7 +106,8 @@ LexToken(VAR,'list',1,1141) LexToken(OPENBRACKET,'(',1,1145) LexToken(DQSTRING,'"str"',1,1150) LexToken(COMMA,',',1,1151) -LexToken(NUMBER,'-1',1,1152) +LexToken(ADDITION,'-',1,1152) +LexToken(NUMBER,'1',1,1153) LexToken(CLOSEBRACKET,')',1,1154) LexToken(COMMA,',',1,1155) LexToken(VAR,'exprs',1,1156) @@ -164,7 +165,8 @@ LexToken(VAR,'model',1,1418) LexToken(DOT,'.',1,1423) LexToken(VAR,'firing',1,1424) LexToken(ASSIGNMENT,'=',1,1430) -LexToken(NUMBER,'-1',1,1431) +LexToken(ADDITION,'-',1,1431) +LexToken(NUMBER,'1',1,1432) LexToken(EOL,'\n',1,1448) LexToken(VAR,'graphics',1,1461) LexToken(DOT,'.',1,1469) @@ -236,7 +238,8 @@ LexToken(VAR,'model',1,1778) LexToken(DOT,'.',1,1783) LexToken(VAR,'firing',1,1784) LexToken(ASSIGNMENT,'=',1,1790) -LexToken(NUMBER,'-1',1,1791) +LexToken(ADDITION,'-',1,1791) +LexToken(NUMBER,'1',1,1792) LexToken(EOL,'\n',1,1793) LexToken(VAR,'model',1,1802) LexToken(DOT,'.',1,1807) diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index b2fa4a48..2770f7cc 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -115,7 +115,8 @@ LexToken(VAR,'list',1,1207) LexToken(OPENBRACKET,'(',1,1211) LexToken(DQSTRING,'"str"',1,1216) LexToken(COMMA,',',1,1217) -LexToken(NUMBER,'-1',1,1218) +LexToken(ADDITION,'-',1,1218) +LexToken(NUMBER,'1',1,1219) LexToken(COMMA,',',1,1220) LexToken(DQSTRING,'"vec"',1,1225) LexToken(COMMA,',',1,1226) @@ -233,7 +234,8 @@ LexToken(VAR,'model',1,1745) LexToken(DOT,'.',1,1750) LexToken(VAR,'firing',1,1751) LexToken(ASSIGNMENT,'=',1,1757) -LexToken(NUMBER,'-1',1,1758) +LexToken(ADDITION,'-',1,1758) +LexToken(NUMBER,'1',1,1759) LexToken(EOL,'\n',1,1775) LexToken(VAR,'graphics',1,1792) LexToken(DOT,'.',1,1800) @@ -316,7 +318,8 @@ LexToken(VAR,'model',1,2162) LexToken(DOT,'.',1,2167) LexToken(VAR,'firing',1,2168) LexToken(ASSIGNMENT,'=',1,2174) -LexToken(NUMBER,'-1',1,2175) +LexToken(ADDITION,'-',1,2175) +LexToken(NUMBER,'1',1,2176) LexToken(EOL,'\n',1,2177) LexToken(VAR,'model',1,2186) LexToken(DOT,'.',1,2191) diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 7dd9b53f..6e58b2b6 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1181) LexToken(OPENBRACKET,'(',1,1185) LexToken(DQSTRING,'"str"',1,1190) LexToken(COMMA,',',1,1191) -LexToken(NUMBER,'-1',1,1192) +LexToken(ADDITION,'-',1,1192) +LexToken(NUMBER,'1',1,1193) LexToken(CLOSEBRACKET,')',1,1194) LexToken(COMMA,',',1,1195) LexToken(VAR,'exprs',1,1196) diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index fbf52931..b5baa780 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -111,7 +111,8 @@ LexToken(VAR,'list',1,1196) LexToken(OPENBRACKET,'(',1,1200) LexToken(DQSTRING,'"intvec"',1,1208) LexToken(COMMA,',',1,1209) -LexToken(NUMBER,'-1',1,1210) +LexToken(ADDITION,'-',1,1210) +LexToken(NUMBER,'1',1,1211) LexToken(CLOSEBRACKET,')',1,1212) LexToken(COMMA,',',1,1213) LexToken(VAR,'exprs',1,1214) @@ -175,7 +176,7 @@ LexToken(VAR,'graphics',1,1546) LexToken(COMMA,',',1,1554) LexToken(NUMBER,'0',1,1555) LexToken(COMMA,',',1,1556) -LexToken(OPERATOR,'-',1,1557) +LexToken(ADDITION,'-',1,1557) LexToken(OPENSQBRACKET,'[',1,1558) LexToken(NUMBER,'1',1,1559) LexToken(COLON,':',1,1560) @@ -381,7 +382,7 @@ LexToken(VAR,'model',1,2613) LexToken(DOT,'.',1,2618) LexToken(VAR,'out',1,2619) LexToken(ASSIGNMENT,'=',1,2622) -LexToken(OPERATOR,'-',1,2623) +LexToken(ADDITION,'-',1,2623) LexToken(OPENSQBRACKET,'[',1,2624) LexToken(NUMBER,'1',1,2625) LexToken(COLON,':',1,2626) diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index d59940cf..1a54418b 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -111,7 +111,8 @@ LexToken(VAR,'list',1,1198) LexToken(OPENBRACKET,'(',1,1202) LexToken(DQSTRING,'"vec"',1,1207) LexToken(COMMA,',',1,1208) -LexToken(NUMBER,'-1',1,1209) +LexToken(ADDITION,'-',1,1209) +LexToken(NUMBER,'1',1,1210) LexToken(CLOSEBRACKET,')',1,1211) LexToken(COMMA,',',1,1212) LexToken(VAR,'exprs',1,1213) @@ -175,7 +176,7 @@ LexToken(VAR,'graphics',1,1545) LexToken(COMMA,',',1,1553) LexToken(NUMBER,'0',1,1554) LexToken(COMMA,',',1,1555) -LexToken(OPERATOR,'-',1,1556) +LexToken(ADDITION,'-',1,1556) LexToken(OPENSQBRACKET,'[',1,1557) LexToken(NUMBER,'1',1,1558) LexToken(COLON,':',1,1559) @@ -381,7 +382,7 @@ LexToken(VAR,'model',1,2580) LexToken(DOT,'.',1,2585) LexToken(VAR,'out',1,2586) LexToken(ASSIGNMENT,'=',1,2589) -LexToken(OPERATOR,'-',1,2590) +LexToken(ADDITION,'-',1,2590) LexToken(OPENSQBRACKET,'[',1,2591) LexToken(NUMBER,'1',1,2592) LexToken(COLON,':',1,2593) diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index e36f6e77..59eb7ff6 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -302,7 +302,7 @@ LexToken(VAR,'model',1,2072) LexToken(DOT,'.',1,2077) LexToken(VAR,'firing',1,2078) LexToken(ASSIGNMENT,'=',1,2084) -LexToken(OPERATOR,'-',1,2085) +LexToken(ADDITION,'-',1,2085) LexToken(VAR,'ones',1,2086) LexToken(OPENBRACKET,'(',1,2090) LexToken(VAR,'out',1,2091) @@ -365,7 +365,8 @@ LexToken(VAR,'list',1,2407) LexToken(OPENBRACKET,'(',1,2411) LexToken(DQSTRING,'"eselect"',1,2420) LexToken(COMMA,',',1,2421) -LexToken(NUMBER,'-2',1,2422) +LexToken(ADDITION,'-',1,2422) +LexToken(NUMBER,'2',1,2423) LexToken(CLOSEBRACKET,')',1,2424) LexToken(EOL,'\n',1,2425) LexToken(VAR,'model',1,2434) @@ -384,7 +385,8 @@ LexToken(VAR,'model',1,2473) LexToken(DOT,'.',1,2478) LexToken(VAR,'intyp',1,2479) LexToken(ASSIGNMENT,'=',1,2484) -LexToken(NUMBER,'-1',1,2485) +LexToken(ADDITION,'-',1,2485) +LexToken(NUMBER,'1',1,2486) LexToken(EOL,'\n',1,2487) LexToken(VAR,'model',1,2496) LexToken(DOT,'.',1,2501) @@ -414,7 +416,7 @@ LexToken(VAR,'model',1,2580) LexToken(DOT,'.',1,2585) LexToken(VAR,'firing',1,2586) LexToken(ASSIGNMENT,'=',1,2592) -LexToken(OPERATOR,'-',1,2593) +LexToken(ADDITION,'-',1,2593) LexToken(VAR,'ones',1,2594) LexToken(OPENBRACKET,'(',1,2598) LexToken(VAR,'out',1,2599) diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 63e3881b..1261224a 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1200) LexToken(OPENBRACKET,'(',1,1204) LexToken(DQSTRING,'"vec"',1,1209) LexToken(COMMA,',',1,1210) -LexToken(NUMBER,'-1',1,1211) +LexToken(ADDITION,'-',1,1211) +LexToken(NUMBER,'1',1,1212) LexToken(CLOSEBRACKET,')',1,1213) LexToken(COMMA,',',1,1214) LexToken(VAR,'exprs',1,1215) @@ -157,7 +158,8 @@ LexToken(COMMA,',',1,1381) LexToken(VAR,'graphics',1,1382) LexToken(COMMA,',',1,1390) LexToken(OPENSQBRACKET,'[',1,1391) -LexToken(NUMBER,'-1',1,1392) +LexToken(ADDITION,'-',1,1392) +LexToken(NUMBER,'1',1,1393) LexToken(CLOSESQBRACKET,']',1,1394) LexToken(COMMA,',',1,1395) LexToken(VAR,'size',1,1396) @@ -239,7 +241,8 @@ LexToken(VAR,'model',1,1736) LexToken(DOT,'.',1,1741) LexToken(VAR,'in',1,1742) LexToken(ASSIGNMENT,'=',1,1744) -LexToken(NUMBER,'-1',1,1745) +LexToken(ADDITION,'-',1,1745) +LexToken(NUMBER,'1',1,1746) LexToken(EOL,'\n',1,1747) LexToken(VAR,'model',1,1756) LexToken(DOT,'.',1,1761) diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 4b75fbc8..1d1b8a8b 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1159) LexToken(OPENBRACKET,'(',1,1163) LexToken(DQSTRING,'"str"',1,1168) LexToken(COMMA,',',1,1169) -LexToken(NUMBER,'-1',1,1170) +LexToken(ADDITION,'-',1,1170) +LexToken(NUMBER,'1',1,1171) LexToken(CLOSEBRACKET,')',1,1172) LexToken(COMMA,',',1,1173) LexToken(VAR,'exprs',1,1174) @@ -234,19 +235,22 @@ LexToken(VAR,'model',1,1782) LexToken(DOT,'.',1,1787) LexToken(VAR,'out',1,1788) LexToken(ASSIGNMENT,'=',1,1791) -LexToken(NUMBER,'-1',1,1792) +LexToken(ADDITION,'-',1,1792) +LexToken(NUMBER,'1',1,1793) LexToken(EOL,'\n',1,1794) LexToken(VAR,'model',1,1803) LexToken(DOT,'.',1,1808) LexToken(VAR,'out2',1,1809) LexToken(ASSIGNMENT,'=',1,1813) -LexToken(NUMBER,'-2',1,1814) +LexToken(ADDITION,'-',1,1814) +LexToken(NUMBER,'2',1,1815) LexToken(EOL,'\n',1,1816) LexToken(VAR,'model',1,1825) LexToken(DOT,'.',1,1830) LexToken(VAR,'outtyp',1,1831) LexToken(ASSIGNMENT,'=',1,1837) -LexToken(NUMBER,'-1',1,1838) +LexToken(ADDITION,'-',1,1838) +LexToken(NUMBER,'1',1,1839) LexToken(EOL,'\n',1,1840) LexToken(VAR,'model',1,1849) LexToken(DOT,'.',1,1854) diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 2f0ceb7a..480963ba 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1161) LexToken(OPENBRACKET,'(',1,1165) LexToken(DQSTRING,'"str"',1,1170) LexToken(COMMA,',',1,1171) -LexToken(NUMBER,'-1',1,1172) +LexToken(ADDITION,'-',1,1172) +LexToken(NUMBER,'1',1,1173) LexToken(CLOSEBRACKET,')',1,1174) LexToken(COMMA,',',1,1175) LexToken(VAR,'exprs',1,1176) @@ -234,19 +235,22 @@ LexToken(VAR,'model',1,1786) LexToken(DOT,'.',1,1791) LexToken(VAR,'out',1,1792) LexToken(ASSIGNMENT,'=',1,1795) -LexToken(NUMBER,'-1',1,1796) +LexToken(ADDITION,'-',1,1796) +LexToken(NUMBER,'1',1,1797) LexToken(EOL,'\n',1,1798) LexToken(VAR,'model',1,1807) LexToken(DOT,'.',1,1812) LexToken(VAR,'out2',1,1813) LexToken(ASSIGNMENT,'=',1,1817) -LexToken(NUMBER,'-2',1,1818) +LexToken(ADDITION,'-',1,1818) +LexToken(NUMBER,'2',1,1819) LexToken(EOL,'\n',1,1820) LexToken(VAR,'model',1,1829) LexToken(DOT,'.',1,1834) LexToken(VAR,'outtyp',1,1835) LexToken(ASSIGNMENT,'=',1,1841) -LexToken(NUMBER,'-1',1,1842) +LexToken(ADDITION,'-',1,1842) +LexToken(NUMBER,'1',1,1843) LexToken(EOL,'\n',1,1844) LexToken(VAR,'model',1,1853) LexToken(DOT,'.',1,1858) diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 9c4461db..1ee21f6b 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -114,7 +114,8 @@ LexToken(VAR,'list',1,1211) LexToken(OPENBRACKET,'(',1,1215) LexToken(DQSTRING,'"str"',1,1220) LexToken(COMMA,',',1,1221) -LexToken(NUMBER,'-1',1,1222) +LexToken(ADDITION,'-',1,1222) +LexToken(NUMBER,'1',1,1223) LexToken(COMMA,',',1,1224) LexToken(DQSTRING,'"vec"',1,1229) LexToken(COMMA,',',1,1230) @@ -279,19 +280,22 @@ LexToken(VAR,'model',1,2025) LexToken(DOT,'.',1,2030) LexToken(VAR,'in',1,2031) LexToken(ASSIGNMENT,'=',1,2033) -LexToken(NUMBER,'-1',1,2034) +LexToken(ADDITION,'-',1,2034) +LexToken(NUMBER,'1',1,2035) LexToken(EOL,'\n',1,2036) LexToken(VAR,'model',1,2045) LexToken(DOT,'.',1,2050) LexToken(VAR,'in2',1,2051) LexToken(ASSIGNMENT,'=',1,2054) -LexToken(NUMBER,'-2',1,2055) +LexToken(ADDITION,'-',1,2055) +LexToken(NUMBER,'2',1,2056) LexToken(EOL,'\n',1,2057) LexToken(VAR,'model',1,2066) LexToken(DOT,'.',1,2071) LexToken(VAR,'intyp',1,2072) LexToken(ASSIGNMENT,'=',1,2077) -LexToken(NUMBER,'-1',1,2078) +LexToken(ADDITION,'-',1,2078) +LexToken(NUMBER,'1',1,2079) LexToken(EOL,'\n',1,2080) LexToken(VAR,'model',1,2089) LexToken(DOT,'.',1,2094) diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index ac9e5beb..fa065e56 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -114,7 +114,8 @@ LexToken(VAR,'list',1,1213) LexToken(OPENBRACKET,'(',1,1217) LexToken(DQSTRING,'"str"',1,1222) LexToken(COMMA,',',1,1223) -LexToken(NUMBER,'-1',1,1224) +LexToken(ADDITION,'-',1,1224) +LexToken(NUMBER,'1',1,1225) LexToken(COMMA,',',1,1226) LexToken(DQSTRING,'"vec"',1,1231) LexToken(COMMA,',',1,1232) @@ -279,13 +280,15 @@ LexToken(VAR,'model',1,2029) LexToken(DOT,'.',1,2034) LexToken(VAR,'in',1,2035) LexToken(ASSIGNMENT,'=',1,2037) -LexToken(NUMBER,'-1',1,2038) +LexToken(ADDITION,'-',1,2038) +LexToken(NUMBER,'1',1,2039) LexToken(EOL,'\n',1,2040) LexToken(VAR,'model',1,2049) LexToken(DOT,'.',1,2054) LexToken(VAR,'in2',1,2055) LexToken(ASSIGNMENT,'=',1,2058) -LexToken(NUMBER,'-2',1,2059) +LexToken(ADDITION,'-',1,2059) +LexToken(NUMBER,'2',1,2060) LexToken(EOL,'\n',1,2061) LexToken(VAR,'model',1,2070) LexToken(DOT,'.',1,2075) diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 2007bae9..4828e647 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1176) LexToken(OPENBRACKET,'(',1,1180) LexToken(DQSTRING,'"str"',1,1185) LexToken(COMMA,',',1,1186) -LexToken(NUMBER,'-1',1,1187) +LexToken(ADDITION,'-',1,1187) +LexToken(NUMBER,'1',1,1188) LexToken(CLOSEBRACKET,')',1,1189) LexToken(COMMA,',',1,1190) LexToken(VAR,'exprs',1,1191) diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 80796c8c..1ba0fc5b 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -110,7 +110,8 @@ LexToken(VAR,'list',1,1178) LexToken(OPENBRACKET,'(',1,1182) LexToken(DQSTRING,'"str"',1,1187) LexToken(COMMA,',',1,1188) -LexToken(NUMBER,'-1',1,1189) +LexToken(ADDITION,'-',1,1189) +LexToken(NUMBER,'1',1,1190) LexToken(CLOSEBRACKET,')',1,1191) LexToken(COMMA,',',1,1192) LexToken(VAR,'exprs',1,1193) diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index a762f076..bde70c2e 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -166,9 +166,10 @@ LexToken(VAR,'model',1,1482) LexToken(COMMA,',',1,1487) LexToken(VAR,'graphics',1,1488) LexToken(COMMA,',',1,1496) -LexToken(NUMBER,'-1',1,1497) +LexToken(ADDITION,'-',1,1497) +LexToken(NUMBER,'1',1,1498) LexToken(COMMA,',',1,1499) -LexToken(OPERATOR,'-',1,1500) +LexToken(ADDITION,'-',1,1500) LexToken(VAR,'ones',1,1501) LexToken(OPENBRACKET,'(',1,1505) LexToken(VAR,'nout',1,1506) @@ -203,7 +204,8 @@ LexToken(DOT,'.',1,1625) LexToken(VAR,'dstate',1,1626) LexToken(ASSIGNMENT,'=',1,1632) LexToken(VAR,'z0',1,1633) -LexToken(NUMBER,'-1',1,1635) +LexToken(ADDITION,'-',1,1635) +LexToken(NUMBER,'1',1,1636) LexToken(COMMA,',',1,1637) LexToken(EOL,'\n',1,1638) LexToken(VAR,'x',1,1659) @@ -238,9 +240,11 @@ LexToken(EOL,'\n',1,1823) LexToken(VAR,'out',1,1832) LexToken(ASSIGNMENT,'=',1,1835) LexToken(OPENSQBRACKET,'[',1,1836) -LexToken(NUMBER,'-1',1,1837) +LexToken(ADDITION,'-',1,1837) +LexToken(NUMBER,'1',1,1838) LexToken(SEMICOLON,';',1,1839) -LexToken(NUMBER,'-1',1,1840) +LexToken(ADDITION,'-',1,1840) +LexToken(NUMBER,'1',1,1841) LexToken(CLOSESQBRACKET,']',1,1842) LexToken(EOL,'\n',1,1843) LexToken(VAR,'nout',1,1852) @@ -268,7 +272,8 @@ LexToken(VAR,'model',1,1933) LexToken(DOT,'.',1,1938) LexToken(VAR,'in',1,1939) LexToken(ASSIGNMENT,'=',1,1941) -LexToken(NUMBER,'-1',1,1942) +LexToken(ADDITION,'-',1,1942) +LexToken(NUMBER,'1',1,1943) LexToken(EOL,'\n',1,1944) LexToken(VAR,'model',1,1953) LexToken(DOT,'.',1,1958) @@ -318,7 +323,7 @@ LexToken(SEMICOLON,';',1,2106) LexToken(VAR,'string',1,2107) LexToken(OPENBRACKET,'(',1,2113) LexToken(VAR,'z0',1,2114) -LexToken(OPERATOR,'+',1,2116) +LexToken(ADDITION,'+',1,2116) LexToken(NUMBER,'1',1,2117) LexToken(CLOSEBRACKET,')',1,2118) LexToken(CLOSESQBRACKET,']',1,2119) diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 3f608c56..81ca280f 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -194,7 +194,7 @@ LexToken(EOL,'\n',1,1640) LexToken(VAR,'ot',1,1657) LexToken(ASSIGNMENT,'=',1,1659) LexToken(VAR,'typ',1,1660) -LexToken(OPERATOR,'*',1,1663) +LexToken(MULTIPLICATION,'*',1,1663) LexToken(VAR,'ones',1,1664) LexToken(OPENBRACKET,'(',1,1668) LexToken(NUMBER,'1',1,1669) @@ -209,15 +209,16 @@ LexToken(EOL,'\n',1,1703) LexToken(VAR,'out',1,1724) LexToken(ASSIGNMENT,'=',1,1727) LexToken(OPENSQBRACKET,'[',1,1728) -LexToken(OPERATOR,'-',1,1729) +LexToken(ADDITION,'-',1,1729) LexToken(VAR,'ones',1,1730) LexToken(OPENBRACKET,'(',1,1734) LexToken(VAR,'nout',1,1735) LexToken(COMMA,',',1,1739) LexToken(NUMBER,'1',1,1740) LexToken(CLOSEBRACKET,')',1,1741) -LexToken(NUMBER,'-2',1,1743) -LexToken(OPERATOR,'*',1,1745) +LexToken(ADDITION,'-',1,1743) +LexToken(NUMBER,'2',1,1744) +LexToken(MULTIPLICATION,'*',1,1745) LexToken(VAR,'ones',1,1746) LexToken(OPENBRACKET,'(',1,1750) LexToken(VAR,'nout',1,1751) @@ -229,8 +230,10 @@ LexToken(EOL,'\n',1,1759) LexToken(VAR,'in',1,1780) LexToken(ASSIGNMENT,'=',1,1782) LexToken(OPENSQBRACKET,'[',1,1783) -LexToken(NUMBER,'-1',1,1784) -LexToken(NUMBER,'-2',1,1787) +LexToken(ADDITION,'-',1,1784) +LexToken(NUMBER,'1',1,1785) +LexToken(ADDITION,'-',1,1787) +LexToken(NUMBER,'2',1,1788) LexToken(CLOSESQBRACKET,']',1,1789) LexToken(EOL,'\n',1,1790) LexToken(OPENSQBRACKET,'[',1,1811) @@ -348,9 +351,11 @@ LexToken(DOT,'.',1,2331) LexToken(VAR,'out',1,2332) LexToken(ASSIGNMENT,'=',1,2335) LexToken(OPENSQBRACKET,'[',1,2336) -LexToken(NUMBER,'-1',1,2337) +LexToken(ADDITION,'-',1,2337) +LexToken(NUMBER,'1',1,2338) LexToken(SEMICOLON,';',1,2339) -LexToken(NUMBER,'-1',1,2340) +LexToken(ADDITION,'-',1,2340) +LexToken(NUMBER,'1',1,2341) LexToken(CLOSESQBRACKET,']',1,2342) LexToken(EOL,'\n',1,2343) LexToken(VAR,'model',1,2352) @@ -358,9 +363,11 @@ LexToken(DOT,'.',1,2357) LexToken(VAR,'out2',1,2358) LexToken(ASSIGNMENT,'=',1,2362) LexToken(OPENSQBRACKET,'[',1,2363) -LexToken(NUMBER,'-2',1,2364) +LexToken(ADDITION,'-',1,2364) +LexToken(NUMBER,'2',1,2365) LexToken(SEMICOLON,';',1,2366) -LexToken(NUMBER,'-2',1,2367) +LexToken(ADDITION,'-',1,2367) +LexToken(NUMBER,'2',1,2368) LexToken(CLOSESQBRACKET,']',1,2369) LexToken(EOL,'\n',1,2370) LexToken(VAR,'model',1,2379) @@ -373,13 +380,15 @@ LexToken(VAR,'model',1,2402) LexToken(DOT,'.',1,2407) LexToken(VAR,'in',1,2408) LexToken(ASSIGNMENT,'=',1,2410) -LexToken(NUMBER,'-1',1,2411) +LexToken(ADDITION,'-',1,2411) +LexToken(NUMBER,'1',1,2412) LexToken(EOL,'\n',1,2413) LexToken(VAR,'model',1,2422) LexToken(DOT,'.',1,2427) LexToken(VAR,'in2',1,2428) LexToken(ASSIGNMENT,'=',1,2431) -LexToken(NUMBER,'-2',1,2432) +LexToken(ADDITION,'-',1,2432) +LexToken(NUMBER,'2',1,2433) LexToken(EOL,'\n',1,2434) LexToken(VAR,'model',1,2443) LexToken(DOT,'.',1,2448) diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index d55624f3..a5b4b9b5 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -109,7 +109,8 @@ LexToken(VAR,'list',1,1188) LexToken(OPENBRACKET,'(',1,1192) LexToken(DQSTRING,'"intvec"',1,1200) LexToken(COMMA,',',1,1201) -LexToken(NUMBER,'-1',1,1202) +LexToken(ADDITION,'-',1,1202) +LexToken(NUMBER,'1',1,1203) LexToken(CLOSEBRACKET,')',1,1204) LexToken(COMMA,',',1,1205) LexToken(VAR,'exprs',1,1206) @@ -171,7 +172,7 @@ LexToken(VAR,'model',1,1530) LexToken(COMMA,',',1,1535) LexToken(VAR,'graphics',1,1536) LexToken(COMMA,',',1,1544) -LexToken(OPERATOR,'-',1,1545) +LexToken(ADDITION,'-',1,1545) LexToken(OPENSQBRACKET,'[',1,1546) LexToken(NUMBER,'1',1,1547) LexToken(COLON,':',1,1548) @@ -373,7 +374,7 @@ LexToken(VAR,'model',1,2540) LexToken(DOT,'.',1,2545) LexToken(VAR,'in',1,2546) LexToken(ASSIGNMENT,'=',1,2548) -LexToken(OPERATOR,'-',1,2549) +LexToken(ADDITION,'-',1,2549) LexToken(OPENSQBRACKET,'[',1,2550) LexToken(NUMBER,'1',1,2551) LexToken(COLON,':',1,2552) diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 4c056cb6..141b653a 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -109,7 +109,8 @@ LexToken(VAR,'list',1,1190) LexToken(OPENBRACKET,'(',1,1194) LexToken(DQSTRING,'"vec"',1,1199) LexToken(COMMA,',',1,1200) -LexToken(NUMBER,'-1',1,1201) +LexToken(ADDITION,'-',1,1201) +LexToken(NUMBER,'1',1,1202) LexToken(CLOSEBRACKET,')',1,1203) LexToken(COMMA,',',1,1204) LexToken(VAR,'exprs',1,1205) @@ -171,7 +172,7 @@ LexToken(VAR,'model',1,1531) LexToken(COMMA,',',1,1536) LexToken(VAR,'graphics',1,1537) LexToken(COMMA,',',1,1545) -LexToken(OPERATOR,'-',1,1546) +LexToken(ADDITION,'-',1,1546) LexToken(OPENSQBRACKET,'[',1,1547) LexToken(NUMBER,'1',1,1548) LexToken(COLON,':',1,1549) @@ -373,7 +374,7 @@ LexToken(VAR,'model',1,2541) LexToken(DOT,'.',1,2546) LexToken(VAR,'in',1,2547) LexToken(ASSIGNMENT,'=',1,2549) -LexToken(OPERATOR,'-',1,2550) +LexToken(ADDITION,'-',1,2550) LexToken(OPENSQBRACKET,'[',1,2551) LexToken(NUMBER,'1',1,2552) LexToken(COLON,':',1,2553) diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 757cfbb9..0e3100bf 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -240,7 +240,8 @@ LexToken(OPENSQBRACKET,'[',1,1826) LexToken(NUMBER,'1',1,1827) LexToken(NUMBER,'1',1,1829) LexToken(SEMICOLON,';',1,1830) -LexToken(NUMBER,'-1',1,1831) +LexToken(ADDITION,'-',1,1831) +LexToken(NUMBER,'1',1,1832) LexToken(NUMBER,'1',1,1834) LexToken(CLOSESQBRACKET,']',1,1835) LexToken(SEMICOLON,';',1,1836) @@ -260,7 +261,7 @@ LexToken(ASSIGNMENT,'=',1,1913) LexToken(OPENSQBRACKET,'[',1,1914) LexToken(NUMBER,'1',1,1915) LexToken(SEMICOLON,';',1,1916) -LexToken(OPERATOR,'-',1,1917) +LexToken(ADDITION,'-',1,1917) LexToken(VAR,'ones',1,1918) LexToken(OPENBRACKET,'(',1,1922) LexToken(VAR,'nin',1,1923) @@ -275,8 +276,9 @@ LexToken(ASSIGNMENT,'=',1,1955) LexToken(OPENSQBRACKET,'[',1,1956) LexToken(NUMBER,'1',1,1957) LexToken(SEMICOLON,';',1,1958) -LexToken(NUMBER,'-2',1,1959) -LexToken(OPERATOR,'*',1,1961) +LexToken(ADDITION,'-',1,1959) +LexToken(NUMBER,'2',1,1960) +LexToken(MULTIPLICATION,'*',1,1961) LexToken(VAR,'ones',1,1962) LexToken(OPENBRACKET,'(',1,1966) LexToken(VAR,'nin',1,1967) @@ -297,8 +299,10 @@ LexToken(EOL,'\n',1,2009) LexToken(VAR,'out',1,2030) LexToken(ASSIGNMENT,'=',1,2033) LexToken(OPENSQBRACKET,'[',1,2034) -LexToken(NUMBER,'-1',1,2035) -LexToken(NUMBER,'-2',1,2038) +LexToken(ADDITION,'-',1,2035) +LexToken(NUMBER,'1',1,2036) +LexToken(ADDITION,'-',1,2038) +LexToken(NUMBER,'2',1,2039) LexToken(CLOSESQBRACKET,']',1,2040) LexToken(SEMICOLON,';',1,2041) LexToken(EOL,'\n',1,2042) @@ -307,10 +311,12 @@ LexToken(EOL,'\n',1,2062) LexToken(VAR,'it',1,2079) LexToken(ASSIGNMENT,'=',1,2081) LexToken(OPENSQBRACKET,'[',1,2082) -LexToken(NUMBER,'-1',1,2083) +LexToken(ADDITION,'-',1,2083) +LexToken(NUMBER,'1',1,2084) LexToken(SEMICOLON,';',1,2085) -LexToken(NUMBER,'-2',1,2086) -LexToken(OPERATOR,'*',1,2088) +LexToken(ADDITION,'-',1,2086) +LexToken(NUMBER,'2',1,2087) +LexToken(MULTIPLICATION,'*',1,2088) LexToken(VAR,'ones',1,2089) LexToken(OPENBRACKET,'(',1,2093) LexToken(VAR,'nin',1,2094) @@ -322,7 +328,8 @@ LexToken(SEMICOLON,';',1,2101) LexToken(EOL,'\n',1,2102) LexToken(VAR,'ot',1,2119) LexToken(ASSIGNMENT,'=',1,2121) -LexToken(NUMBER,'-2',1,2122) +LexToken(ADDITION,'-',1,2122) +LexToken(NUMBER,'2',1,2123) LexToken(SEMICOLON,';',1,2124) LexToken(EOL,'\n',1,2125) LexToken(OPENSQBRACKET,'[',1,2142) @@ -413,9 +420,11 @@ LexToken(ASSIGNMENT,'=',1,2600) LexToken(OPENSQBRACKET,'[',1,2601) LexToken(NUMBER,'1',1,2602) LexToken(SEMICOLON,';',1,2603) -LexToken(NUMBER,'-1',1,2604) +LexToken(ADDITION,'-',1,2604) +LexToken(NUMBER,'1',1,2605) LexToken(SEMICOLON,';',1,2606) -LexToken(NUMBER,'-1',1,2607) +LexToken(ADDITION,'-',1,2607) +LexToken(NUMBER,'1',1,2608) LexToken(CLOSESQBRACKET,']',1,2609) LexToken(EOL,'\n',1,2610) LexToken(VAR,'ipar',1,2619) @@ -458,7 +467,8 @@ LexToken(VAR,'model',1,2738) LexToken(DOT,'.',1,2743) LexToken(VAR,'out',1,2744) LexToken(ASSIGNMENT,'=',1,2747) -LexToken(NUMBER,'-1',1,2748) +LexToken(ADDITION,'-',1,2748) +LexToken(NUMBER,'1',1,2749) LexToken(EOL,'\n',1,2750) LexToken(VAR,'model',1,2759) LexToken(DOT,'.',1,2764) diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index b6d17df0..8addfd89 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -141,7 +141,7 @@ LexToken(VAR,'model',1,1287) LexToken(COMMA,',',1,1292) LexToken(VAR,'graphics',1,1293) LexToken(COMMA,',',1,1301) -LexToken(OPERATOR,'-',1,1302) +LexToken(ADDITION,'-',1,1302) LexToken(VAR,'ones',1,1303) LexToken(OPENBRACKET,'(',1,1307) LexToken(VAR,'nin',1,1308) @@ -149,7 +149,8 @@ LexToken(COMMA,',',1,1311) LexToken(NUMBER,'1',1,1312) LexToken(CLOSEBRACKET,')',1,1313) LexToken(COMMA,',',1,1314) -LexToken(NUMBER,'-1',1,1315) +LexToken(ADDITION,'-',1,1315) +LexToken(NUMBER,'1',1,1316) LexToken(COMMA,',',1,1317) LexToken(OPENSQBRACKET,'[',1,1318) LexToken(CLOSESQBRACKET,']',1,1319) @@ -196,9 +197,11 @@ LexToken(EOL,'\n',1,1526) LexToken(VAR,'in',1,1535) LexToken(ASSIGNMENT,'=',1,1537) LexToken(OPENSQBRACKET,'[',1,1538) -LexToken(NUMBER,'-1',1,1539) +LexToken(ADDITION,'-',1,1539) +LexToken(NUMBER,'1',1,1540) LexToken(SEMICOLON,';',1,1541) -LexToken(NUMBER,'-1',1,1542) +LexToken(ADDITION,'-',1,1542) +LexToken(NUMBER,'1',1,1543) LexToken(CLOSESQBRACKET,']',1,1544) LexToken(EOL,'\n',1,1545) LexToken(VAR,'nin',1,1554) @@ -227,7 +230,8 @@ LexToken(VAR,'model',1,1642) LexToken(DOT,'.',1,1647) LexToken(VAR,'out',1,1648) LexToken(ASSIGNMENT,'=',1,1651) -LexToken(NUMBER,'-1',1,1652) +LexToken(ADDITION,'-',1,1652) +LexToken(NUMBER,'1',1,1653) LexToken(EOL,'\n',1,1654) LexToken(VAR,'model',1,1663) LexToken(DOT,'.',1,1668) diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 180882d5..84dc30fd 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -172,7 +172,7 @@ LexToken(VAR,'model',1,1500) LexToken(COMMA,',',1,1505) LexToken(VAR,'graphics',1,1506) LexToken(COMMA,',',1,1514) -LexToken(OPERATOR,'-',1,1515) +LexToken(ADDITION,'-',1,1515) LexToken(VAR,'ones',1,1516) LexToken(OPENBRACKET,'(',1,1520) LexToken(VAR,'nin',1,1521) @@ -180,7 +180,8 @@ LexToken(COMMA,',',1,1524) LexToken(NUMBER,'1',1,1525) LexToken(CLOSEBRACKET,')',1,1526) LexToken(COMMA,',',1,1527) -LexToken(NUMBER,'-1',1,1528) +LexToken(ADDITION,'-',1,1528) +LexToken(NUMBER,'1',1,1529) LexToken(COMMA,',',1,1530) LexToken(VAR,'ones',1,1531) LexToken(OPENBRACKET,'(',1,1535) @@ -209,7 +210,8 @@ LexToken(DOT,'.',1,1641) LexToken(VAR,'dstate',1,1642) LexToken(ASSIGNMENT,'=',1,1648) LexToken(VAR,'z0',1,1649) -LexToken(NUMBER,'-1',1,1651) +LexToken(ADDITION,'-',1,1651) +LexToken(NUMBER,'1',1,1652) LexToken(EOL,'\n',1,1653) LexToken(VAR,'x',1,1674) LexToken(DOT,'.',1,1675) @@ -243,9 +245,11 @@ LexToken(EOL,'\n',1,1838) LexToken(VAR,'in',1,1847) LexToken(ASSIGNMENT,'=',1,1849) LexToken(OPENSQBRACKET,'[',1,1850) -LexToken(NUMBER,'-1',1,1851) +LexToken(ADDITION,'-',1,1851) +LexToken(NUMBER,'1',1,1852) LexToken(SEMICOLON,';',1,1853) -LexToken(NUMBER,'-1',1,1854) +LexToken(ADDITION,'-',1,1854) +LexToken(NUMBER,'1',1,1855) LexToken(CLOSESQBRACKET,']',1,1856) LexToken(EOL,'\n',1,1857) LexToken(VAR,'nin',1,1866) @@ -279,7 +283,8 @@ LexToken(VAR,'model',1,1963) LexToken(DOT,'.',1,1968) LexToken(VAR,'out',1,1969) LexToken(ASSIGNMENT,'=',1,1972) -LexToken(NUMBER,'-1',1,1973) +LexToken(ADDITION,'-',1,1973) +LexToken(NUMBER,'1',1,1974) LexToken(EOL,'\n',1,1975) LexToken(VAR,'model',1,1984) LexToken(DOT,'.',1,1989) @@ -330,7 +335,7 @@ LexToken(SEMICOLON,';',1,2137) LexToken(VAR,'string',1,2138) LexToken(OPENBRACKET,'(',1,2144) LexToken(VAR,'i0',1,2145) -LexToken(OPERATOR,'+',1,2147) +LexToken(ADDITION,'+',1,2147) LexToken(NUMBER,'1',1,2148) LexToken(CLOSEBRACKET,')',1,2149) LexToken(CLOSESQBRACKET,']',1,2150) diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index b031cb25..cd3c4e7c 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -138,7 +138,8 @@ LexToken(IF,'if',1,1346) LexToken(OPENBRACKET,'(',1,1348) LexToken(VAR,'nout',1,1349) LexToken(COMPARISON,'<>',1,1353) -LexToken(NUMBER,'-1',1,1355) +LexToken(ADDITION,'-',1,1355) +LexToken(NUMBER,'1',1,1356) LexToken(LOGICAL,'&',1,1358) LexToken(OPENBRACKET,'(',1,1360) LexToken(VAR,'nout',1,1361) @@ -228,7 +229,8 @@ LexToken(THEN,'then',1,1812) LexToken(EOL,'\n',1,1816) LexToken(VAR,'nout',1,1825) LexToken(ASSIGNMENT,'=',1,1829) -LexToken(NUMBER,'-1',1,1830) +LexToken(ADDITION,'-',1,1830) +LexToken(NUMBER,'1',1,1831) LexToken(EOL,'\n',1,1832) LexToken(VAR,'model',1,1841) LexToken(ASSIGNMENT,'=',1,1846) diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index da2f20d2..0e4f87ab 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -166,7 +166,7 @@ LexToken(VAR,'model',1,1477) LexToken(COMMA,',',1,1482) LexToken(VAR,'graphics',1,1483) LexToken(COMMA,',',1,1491) -LexToken(OPERATOR,'-',1,1492) +LexToken(ADDITION,'-',1,1492) LexToken(VAR,'ones',1,1493) LexToken(OPENBRACKET,'(',1,1497) LexToken(VAR,'nin',1,1498) @@ -174,7 +174,8 @@ LexToken(COMMA,',',1,1501) LexToken(NUMBER,'1',1,1502) LexToken(CLOSEBRACKET,')',1,1503) LexToken(COMMA,',',1,1504) -LexToken(NUMBER,'-1',1,1505) +LexToken(ADDITION,'-',1,1505) +LexToken(NUMBER,'1',1,1506) LexToken(COMMA,',',1,1507) LexToken(VAR,'ones',1,1508) LexToken(OPENBRACKET,'(',1,1512) @@ -203,7 +204,8 @@ LexToken(DOT,'.',1,1618) LexToken(VAR,'dstate',1,1619) LexToken(ASSIGNMENT,'=',1,1625) LexToken(VAR,'z0',1,1626) -LexToken(NUMBER,'-1',1,1628) +LexToken(ADDITION,'-',1,1628) +LexToken(NUMBER,'1',1,1629) LexToken(COMMA,',',1,1630) LexToken(EOL,'\n',1,1631) LexToken(VAR,'x',1,1652) @@ -238,9 +240,11 @@ LexToken(EOL,'\n',1,1816) LexToken(VAR,'in',1,1825) LexToken(ASSIGNMENT,'=',1,1827) LexToken(OPENSQBRACKET,'[',1,1828) -LexToken(NUMBER,'-1',1,1829) +LexToken(ADDITION,'-',1,1829) +LexToken(NUMBER,'1',1,1830) LexToken(SEMICOLON,';',1,1831) -LexToken(NUMBER,'-1',1,1832) +LexToken(ADDITION,'-',1,1832) +LexToken(NUMBER,'1',1,1833) LexToken(CLOSESQBRACKET,']',1,1834) LexToken(EOL,'\n',1,1835) LexToken(VAR,'nin',1,1844) @@ -275,7 +279,8 @@ LexToken(VAR,'model',1,1945) LexToken(DOT,'.',1,1950) LexToken(VAR,'out',1,1951) LexToken(ASSIGNMENT,'=',1,1954) -LexToken(NUMBER,'-1',1,1955) +LexToken(ADDITION,'-',1,1955) +LexToken(NUMBER,'1',1,1956) LexToken(EOL,'\n',1,1957) LexToken(VAR,'model',1,1966) LexToken(DOT,'.',1,1971) @@ -319,7 +324,7 @@ LexToken(SEMICOLON,';',1,2095) LexToken(VAR,'string',1,2096) LexToken(OPENBRACKET,'(',1,2102) LexToken(VAR,'z0',1,2103) -LexToken(OPERATOR,'+',1,2105) +LexToken(ADDITION,'+',1,2105) LexToken(NUMBER,'1',1,2106) LexToken(CLOSEBRACKET,')',1,2107) LexToken(CLOSESQBRACKET,']',1,2108) diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 742faf99..0a379b8f 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -176,7 +176,8 @@ LexToken(LOGICAL,'&',1,1512) LexToken(OPENBRACKET,'(',1,1514) LexToken(VAR,'typ',1,1515) LexToken(COMPARISON,'<>',1,1518) -LexToken(NUMBER,'-1',1,1520) +LexToken(ADDITION,'-',1,1520) +LexToken(NUMBER,'1',1,1521) LexToken(CLOSEBRACKET,')',1,1522) LexToken(THEN,'then',1,1524) LexToken(EOL,'\n',1,1528) @@ -196,7 +197,7 @@ LexToken(EOL,'\n',1,1622) LexToken(VAR,'it',1,1639) LexToken(ASSIGNMENT,'=',1,1641) LexToken(VAR,'typ',1,1642) -LexToken(OPERATOR,'*',1,1645) +LexToken(MULTIPLICATION,'*',1,1645) LexToken(VAR,'ones',1,1646) LexToken(OPENBRACKET,'(',1,1650) LexToken(NUMBER,'1',1,1651) @@ -215,15 +216,16 @@ LexToken(EOL,'\n',1,1707) LexToken(VAR,'in',1,1728) LexToken(ASSIGNMENT,'=',1,1730) LexToken(OPENSQBRACKET,'[',1,1731) -LexToken(OPERATOR,'-',1,1732) +LexToken(ADDITION,'-',1,1732) LexToken(VAR,'ones',1,1733) LexToken(OPENBRACKET,'(',1,1737) LexToken(VAR,'nin',1,1738) LexToken(COMMA,',',1,1741) LexToken(NUMBER,'1',1,1742) LexToken(CLOSEBRACKET,')',1,1743) -LexToken(NUMBER,'-2',1,1745) -LexToken(OPERATOR,'*',1,1747) +LexToken(ADDITION,'-',1,1745) +LexToken(NUMBER,'2',1,1746) +LexToken(MULTIPLICATION,'*',1,1747) LexToken(VAR,'ones',1,1748) LexToken(OPENBRACKET,'(',1,1752) LexToken(VAR,'nin',1,1753) @@ -235,8 +237,10 @@ LexToken(EOL,'\n',1,1760) LexToken(VAR,'out',1,1781) LexToken(ASSIGNMENT,'=',1,1784) LexToken(OPENSQBRACKET,'[',1,1785) -LexToken(NUMBER,'-1',1,1786) -LexToken(NUMBER,'-2',1,1789) +LexToken(ADDITION,'-',1,1786) +LexToken(NUMBER,'1',1,1787) +LexToken(ADDITION,'-',1,1789) +LexToken(NUMBER,'2',1,1790) LexToken(CLOSESQBRACKET,']',1,1791) LexToken(EOL,'\n',1,1792) LexToken(OPENSQBRACKET,'[',1,1813) @@ -354,9 +358,11 @@ LexToken(DOT,'.',1,2331) LexToken(VAR,'in',1,2332) LexToken(ASSIGNMENT,'=',1,2334) LexToken(OPENSQBRACKET,'[',1,2335) -LexToken(NUMBER,'-1',1,2336) +LexToken(ADDITION,'-',1,2336) +LexToken(NUMBER,'1',1,2337) LexToken(SEMICOLON,';',1,2338) -LexToken(NUMBER,'-1',1,2339) +LexToken(ADDITION,'-',1,2339) +LexToken(NUMBER,'1',1,2340) LexToken(CLOSESQBRACKET,']',1,2341) LexToken(EOL,'\n',1,2342) LexToken(VAR,'model',1,2351) @@ -364,9 +370,11 @@ LexToken(DOT,'.',1,2356) LexToken(VAR,'in2',1,2357) LexToken(ASSIGNMENT,'=',1,2360) LexToken(OPENSQBRACKET,'[',1,2361) -LexToken(NUMBER,'-2',1,2362) +LexToken(ADDITION,'-',1,2362) +LexToken(NUMBER,'2',1,2363) LexToken(SEMICOLON,';',1,2364) -LexToken(NUMBER,'-2',1,2365) +LexToken(ADDITION,'-',1,2365) +LexToken(NUMBER,'2',1,2366) LexToken(CLOSESQBRACKET,']',1,2367) LexToken(EOL,'\n',1,2368) LexToken(VAR,'model',1,2377) @@ -379,13 +387,15 @@ LexToken(VAR,'model',1,2399) LexToken(DOT,'.',1,2404) LexToken(VAR,'out',1,2405) LexToken(ASSIGNMENT,'=',1,2408) -LexToken(NUMBER,'-1',1,2409) +LexToken(ADDITION,'-',1,2409) +LexToken(NUMBER,'1',1,2410) LexToken(EOL,'\n',1,2411) LexToken(VAR,'model',1,2420) LexToken(DOT,'.',1,2425) LexToken(VAR,'out2',1,2426) LexToken(ASSIGNMENT,'=',1,2430) -LexToken(NUMBER,'-2',1,2431) +LexToken(ADDITION,'-',1,2431) +LexToken(NUMBER,'2',1,2432) LexToken(EOL,'\n',1,2433) LexToken(VAR,'model',1,2442) LexToken(DOT,'.',1,2447) diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index f1aea3ac..1a6c1efd 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -258,11 +258,13 @@ LexToken(EOL,'\n',1,1938) LexToken(VAR,'in',1,1947) LexToken(ASSIGNMENT,'=',1,1949) LexToken(OPENSQBRACKET,'[',1,1950) -LexToken(NUMBER,'-1',1,1951) +LexToken(ADDITION,'-',1,1951) +LexToken(NUMBER,'1',1,1952) LexToken(SEMICOLON,';',1,1953) LexToken(NUMBER,'1',1,1954) LexToken(SEMICOLON,';',1,1955) -LexToken(NUMBER,'-1',1,1956) +LexToken(ADDITION,'-',1,1956) +LexToken(NUMBER,'1',1,1957) LexToken(CLOSESQBRACKET,']',1,1958) LexToken(EOL,'\n',1,1959) LexToken(VAR,'ipar',1,1968) @@ -307,7 +309,8 @@ LexToken(VAR,'model',1,2108) LexToken(DOT,'.',1,2113) LexToken(VAR,'out',1,2114) LexToken(ASSIGNMENT,'=',1,2117) -LexToken(NUMBER,'-1',1,2118) +LexToken(ADDITION,'-',1,2118) +LexToken(NUMBER,'1',1,2119) LexToken(EOL,'\n',1,2120) LexToken(VAR,'model',1,2129) LexToken(DOT,'.',1,2134) diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 0dc5207a..9849244d 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -260,7 +260,8 @@ LexToken(LOGICAL,'&',1,1920) LexToken(OPENBRACKET,'(',1,1921) LexToken(VAR,'ot',1,1922) LexToken(COMPARISON,'<>',1,1924) -LexToken(NUMBER,'-1',1,1926) +LexToken(ADDITION,'-',1,1926) +LexToken(NUMBER,'1',1,1927) LexToken(CLOSEBRACKET,')',1,1928) LexToken(THEN,'then',1,1930) LexToken(EOL,'\n',1,1934) @@ -428,11 +429,13 @@ LexToken(DOT,'.',1,2615) LexToken(VAR,'in',1,2616) LexToken(ASSIGNMENT,'=',1,2618) LexToken(OPENSQBRACKET,'[',1,2619) -LexToken(NUMBER,'-1',1,2620) +LexToken(ADDITION,'-',1,2620) +LexToken(NUMBER,'1',1,2621) LexToken(SEMICOLON,';',1,2622) LexToken(NUMBER,'1',1,2623) LexToken(SEMICOLON,';',1,2624) -LexToken(NUMBER,'-1',1,2625) +LexToken(ADDITION,'-',1,2625) +LexToken(NUMBER,'1',1,2626) LexToken(CLOSESQBRACKET,']',1,2627) LexToken(EOL,'\n',1,2628) LexToken(VAR,'model',1,2637) @@ -440,11 +443,13 @@ LexToken(DOT,'.',1,2642) LexToken(VAR,'in2',1,2643) LexToken(ASSIGNMENT,'=',1,2646) LexToken(OPENSQBRACKET,'[',1,2647) -LexToken(NUMBER,'-2',1,2648) +LexToken(ADDITION,'-',1,2648) +LexToken(NUMBER,'2',1,2649) LexToken(SEMICOLON,';',1,2650) LexToken(NUMBER,'1',1,2651) LexToken(SEMICOLON,';',1,2652) -LexToken(NUMBER,'-2',1,2653) +LexToken(ADDITION,'-',1,2653) +LexToken(NUMBER,'2',1,2654) LexToken(CLOSESQBRACKET,']',1,2655) LexToken(EOL,'\n',1,2656) LexToken(VAR,'model',1,2665) @@ -457,13 +462,15 @@ LexToken(VAR,'model',1,2687) LexToken(DOT,'.',1,2692) LexToken(VAR,'out',1,2693) LexToken(ASSIGNMENT,'=',1,2696) -LexToken(NUMBER,'-1',1,2697) +LexToken(ADDITION,'-',1,2697) +LexToken(NUMBER,'1',1,2698) LexToken(EOL,'\n',1,2699) LexToken(VAR,'model',1,2708) LexToken(DOT,'.',1,2713) LexToken(VAR,'out2',1,2714) LexToken(ASSIGNMENT,'=',1,2718) -LexToken(NUMBER,'-2',1,2719) +LexToken(ADDITION,'-',1,2719) +LexToken(NUMBER,'2',1,2720) LexToken(EOL,'\n',1,2721) LexToken(VAR,'model',1,2730) LexToken(DOT,'.',1,2735) diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index a6924fee..d397b75b 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -172,7 +172,7 @@ LexToken(VAR,'model',1,1500) LexToken(COMMA,',',1,1505) LexToken(VAR,'graphics',1,1506) LexToken(COMMA,',',1,1514) -LexToken(OPERATOR,'-',1,1515) +LexToken(ADDITION,'-',1,1515) LexToken(VAR,'ones',1,1516) LexToken(OPENBRACKET,'(',1,1520) LexToken(VAR,'nin',1,1521) @@ -180,7 +180,8 @@ LexToken(COMMA,',',1,1524) LexToken(NUMBER,'1',1,1525) LexToken(CLOSEBRACKET,')',1,1526) LexToken(COMMA,',',1,1527) -LexToken(NUMBER,'-1',1,1528) +LexToken(ADDITION,'-',1,1528) +LexToken(NUMBER,'1',1,1529) LexToken(COMMA,',',1,1530) LexToken(OPENSQBRACKET,'[',1,1531) LexToken(CLOSESQBRACKET,']',1,1532) @@ -205,7 +206,8 @@ LexToken(DOT,'.',1,1632) LexToken(VAR,'ipar',1,1633) LexToken(ASSIGNMENT,'=',1,1637) LexToken(VAR,'z0',1,1638) -LexToken(NUMBER,'-1',1,1640) +LexToken(ADDITION,'-',1,1640) +LexToken(NUMBER,'1',1,1641) LexToken(EOL,'\n',1,1642) LexToken(VAR,'x',1,1663) LexToken(DOT,'.',1,1664) @@ -239,9 +241,11 @@ LexToken(EOL,'\n',1,1827) LexToken(VAR,'in',1,1836) LexToken(ASSIGNMENT,'=',1,1838) LexToken(OPENSQBRACKET,'[',1,1839) -LexToken(NUMBER,'-1',1,1840) +LexToken(ADDITION,'-',1,1840) +LexToken(NUMBER,'1',1,1841) LexToken(SEMICOLON,';',1,1842) -LexToken(NUMBER,'-1',1,1843) +LexToken(ADDITION,'-',1,1843) +LexToken(NUMBER,'1',1,1844) LexToken(CLOSESQBRACKET,']',1,1845) LexToken(EOL,'\n',1,1846) LexToken(VAR,'nin',1,1855) @@ -275,7 +279,8 @@ LexToken(VAR,'model',1,1954) LexToken(DOT,'.',1,1959) LexToken(VAR,'out',1,1960) LexToken(ASSIGNMENT,'=',1,1963) -LexToken(NUMBER,'-1',1,1964) +LexToken(ADDITION,'-',1,1964) +LexToken(NUMBER,'1',1,1965) LexToken(EOL,'\n',1,1966) LexToken(VAR,'model',1,1975) LexToken(DOT,'.',1,1980) @@ -317,7 +322,7 @@ LexToken(SEMICOLON,';',1,2097) LexToken(VAR,'string',1,2098) LexToken(OPENBRACKET,'(',1,2104) LexToken(VAR,'i0',1,2105) -LexToken(OPERATOR,'+',1,2107) +LexToken(ADDITION,'+',1,2107) LexToken(NUMBER,'1',1,2108) LexToken(CLOSEBRACKET,')',1,2109) LexToken(CLOSESQBRACKET,']',1,2110) diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index ac35f17d..b4e29358 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -163,7 +163,8 @@ LexToken(NUMBER,'70',1,1411) LexToken(COMMA,',',1,1413) LexToken(NUMBER,'2',1,1414) LexToken(COMMA,',',1,1415) -LexToken(NUMBER,'-2',1,1416) +LexToken(ADDITION,'-',1,1416) +LexToken(NUMBER,'2',1,1417) LexToken(COMMA,',',1,1418) LexToken(NUMBER,'0',1,1419) LexToken(CLOSESQBRACKET,']',1,1420) @@ -268,7 +269,8 @@ LexToken(COMMA,',',1,1749) LexToken(NUMBER,'3',1,1750) LexToken(CLOSEBRACKET,')',1,1751) LexToken(COMPARISON,'==',1,1752) -LexToken(NUMBER,'-1',1,1754) +LexToken(ADDITION,'-',1,1754) +LexToken(NUMBER,'1',1,1755) LexToken(THEN,'then',1,1757) LexToken(EOL,'\n',1,1761) LexToken(VAR,'Typeout',1,1778) @@ -302,7 +304,8 @@ LexToken(COMMA,',',1,1872) LexToken(NUMBER,'3',1,1873) LexToken(CLOSEBRACKET,')',1,1874) LexToken(COMPARISON,'==',1,1875) -LexToken(NUMBER,'-2',1,1877) +LexToken(ADDITION,'-',1,1877) +LexToken(NUMBER,'2',1,1878) LexToken(THEN,'then',1,1880) LexToken(EOL,'\n',1,1884) LexToken(VAR,'Typeout',1,1901) diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index a8787e8f..3b2eb06e 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -163,7 +163,8 @@ LexToken(NUMBER,'70',1,1411) LexToken(COMMA,',',1,1413) LexToken(NUMBER,'2',1,1414) LexToken(COMMA,',',1,1415) -LexToken(NUMBER,'-2',1,1416) +LexToken(ADDITION,'-',1,1416) +LexToken(NUMBER,'2',1,1417) LexToken(COMMA,',',1,1418) LexToken(NUMBER,'0',1,1419) LexToken(CLOSESQBRACKET,']',1,1420) @@ -267,7 +268,8 @@ LexToken(COMMA,',',1,1748) LexToken(NUMBER,'3',1,1749) LexToken(CLOSEBRACKET,')',1,1750) LexToken(COMPARISON,'==',1,1751) -LexToken(NUMBER,'-1',1,1753) +LexToken(ADDITION,'-',1,1753) +LexToken(NUMBER,'1',1,1754) LexToken(THEN,'then',1,1756) LexToken(EOL,'\n',1,1760) LexToken(VAR,'Typeout',1,1777) @@ -301,7 +303,8 @@ LexToken(COMMA,',',1,1871) LexToken(NUMBER,'3',1,1872) LexToken(CLOSEBRACKET,')',1,1873) LexToken(COMPARISON,'==',1,1874) -LexToken(NUMBER,'-2',1,1876) +LexToken(ADDITION,'-',1,1876) +LexToken(NUMBER,'2',1,1877) LexToken(THEN,'then',1,1879) LexToken(EOL,'\n',1,1883) LexToken(VAR,'Typeout',1,1900) diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 3d5f8802..0e3a997d 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -263,7 +263,8 @@ LexToken(NUMBER,'97.5',1,1849) LexToken(COMMA,',',1,1853) LexToken(NUMBER,'90',1,1854) LexToken(COMMA,',',1,1856) -LexToken(NUMBER,'-2',1,1857) +LexToken(ADDITION,'-',1,1857) +LexToken(NUMBER,'2',1,1858) LexToken(COMMA,',',1,1859) LexToken(NUMBER,'0',1,1860) LexToken(SEMICOLON,';',1,1861) @@ -271,7 +272,8 @@ LexToken(NUMBER,'97.5',1,1862) LexToken(COMMA,',',1,1866) LexToken(NUMBER,'10',1,1867) LexToken(COMMA,',',1,1869) -LexToken(NUMBER,'-2',1,1870) +LexToken(ADDITION,'-',1,1870) +LexToken(NUMBER,'2',1,1871) LexToken(COMMA,',',1,1872) LexToken(NUMBER,'0',1,1873) LexToken(CLOSESQBRACKET,']',1,1874) @@ -376,7 +378,8 @@ LexToken(COMMA,',',1,2207) LexToken(NUMBER,'3',1,2208) LexToken(CLOSEBRACKET,')',1,2209) LexToken(COMPARISON,'==',1,2210) -LexToken(NUMBER,'-1',1,2212) +LexToken(ADDITION,'-',1,2212) +LexToken(NUMBER,'1',1,2213) LexToken(THEN,'then',1,2215) LexToken(EOL,'\n',1,2219) LexToken(VAR,'Typeout',1,2236) @@ -410,7 +413,8 @@ LexToken(COMMA,',',1,2330) LexToken(NUMBER,'3',1,2331) LexToken(CLOSEBRACKET,')',1,2332) LexToken(COMPARISON,'==',1,2333) -LexToken(NUMBER,'-2',1,2335) +LexToken(ADDITION,'-',1,2335) +LexToken(NUMBER,'2',1,2336) LexToken(THEN,'then',1,2338) LexToken(EOL,'\n',1,2342) LexToken(VAR,'Typeout',1,2359) diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 358eec59..d994df08 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -121,7 +121,7 @@ LexToken(SEMICOLON,';',1,1333) LexToken(DQSTRING,'""',1,1335) LexToken(SEMICOLON,';',1,1336) LexToken(DQSTRING,'"N:"',1,1340) -LexToken(OPERATOR,'+',1,1341) +LexToken(ADDITION,'+',1,1341) LexToken(DQSTRING,'" Turn ratio (N1/N2)"',1,1378) LexToken(CLOSESQBRACKET,']',1,1379) LexToken(COMMA,',',1,1380) @@ -249,7 +249,8 @@ LexToken(NUMBER,'97.5',1,1834) LexToken(COMMA,',',1,1838) LexToken(NUMBER,'90',1,1839) LexToken(COMMA,',',1,1841) -LexToken(NUMBER,'-2',1,1842) +LexToken(ADDITION,'-',1,1842) +LexToken(NUMBER,'2',1,1843) LexToken(COMMA,',',1,1844) LexToken(NUMBER,'0',1,1845) LexToken(SEMICOLON,';',1,1846) @@ -257,7 +258,8 @@ LexToken(NUMBER,'97.5',1,1847) LexToken(COMMA,',',1,1851) LexToken(NUMBER,'10',1,1852) LexToken(COMMA,',',1,1854) -LexToken(NUMBER,'-2',1,1855) +LexToken(ADDITION,'-',1,1855) +LexToken(NUMBER,'2',1,1856) LexToken(COMMA,',',1,1857) LexToken(NUMBER,'0',1,1858) LexToken(CLOSESQBRACKET,']',1,1859) @@ -362,7 +364,8 @@ LexToken(COMMA,',',1,2192) LexToken(NUMBER,'3',1,2193) LexToken(CLOSEBRACKET,')',1,2194) LexToken(COMPARISON,'==',1,2195) -LexToken(NUMBER,'-1',1,2197) +LexToken(ADDITION,'-',1,2197) +LexToken(NUMBER,'1',1,2198) LexToken(THEN,'then',1,2200) LexToken(EOL,'\n',1,2204) LexToken(VAR,'Typeout',1,2221) @@ -396,7 +399,8 @@ LexToken(COMMA,',',1,2315) LexToken(NUMBER,'3',1,2316) LexToken(CLOSEBRACKET,')',1,2317) LexToken(COMPARISON,'==',1,2318) -LexToken(NUMBER,'-2',1,2320) +LexToken(ADDITION,'-',1,2320) +LexToken(NUMBER,'2',1,2321) LexToken(THEN,'then',1,2323) LexToken(EOL,'\n',1,2327) LexToken(VAR,'Typeout',1,2344) diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 04ebeca1..2e6d8e25 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -201,7 +201,8 @@ LexToken(VAR,'L',1,1570) LexToken(ASSIGNMENT,'=',1,1571) LexToken(NUMBER,'1.',1,1572) LexToken(VAR,'d',1,1574) -LexToken(NUMBER,'-5',1,1575) +LexToken(ADDITION,'-',1,1575) +LexToken(NUMBER,'5',1,1576) LexToken(EOL,'\n',1,1577) LexToken(VAR,'model',1,1586) LexToken(DOT,'.',1,1591) diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 1c2ae7ae..3c57cd23 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -143,39 +143,48 @@ LexToken(VAR,'list',1,1564) LexToken(OPENBRACKET,'(',1,1568) LexToken(DQSTRING,'"vec"',1,1573) LexToken(COMMA,',',1,1574) -LexToken(NUMBER,'-1',1,1575) +LexToken(ADDITION,'-',1,1575) +LexToken(NUMBER,'1',1,1576) LexToken(COMMA,',',1,1577) LexToken(DQSTRING,'"vec"',1,1582) LexToken(COMMA,',',1,1583) -LexToken(NUMBER,'-1',1,1584) +LexToken(ADDITION,'-',1,1584) +LexToken(NUMBER,'1',1,1585) LexToken(COMMA,',',1,1586) LexToken(DQSTRING,'"vec"',1,1591) LexToken(COMMA,',',1,1592) -LexToken(NUMBER,'-1',1,1593) +LexToken(ADDITION,'-',1,1593) +LexToken(NUMBER,'1',1,1594) LexToken(COMMA,',',1,1595) LexToken(DQSTRING,'"vec"',1,1600) LexToken(COMMA,',',1,1601) -LexToken(NUMBER,'-1',1,1602) +LexToken(ADDITION,'-',1,1602) +LexToken(NUMBER,'1',1,1603) LexToken(COMMA,',',1,1604) LexToken(DQSTRING,'"vec"',1,1609) LexToken(COMMA,',',1,1610) -LexToken(NUMBER,'-1',1,1611) +LexToken(ADDITION,'-',1,1611) +LexToken(NUMBER,'1',1,1612) LexToken(COMMA,',',1,1613) LexToken(DQSTRING,'"vec"',1,1618) LexToken(COMMA,',',1,1619) -LexToken(NUMBER,'-1',1,1620) +LexToken(ADDITION,'-',1,1620) +LexToken(NUMBER,'1',1,1621) LexToken(COMMA,',',1,1622) LexToken(DQSTRING,'"vec"',1,1627) LexToken(COMMA,',',1,1628) -LexToken(NUMBER,'-1',1,1629) +LexToken(ADDITION,'-',1,1629) +LexToken(NUMBER,'1',1,1630) LexToken(COMMA,',',1,1631) LexToken(DQSTRING,'"vec"',1,1636) LexToken(COMMA,',',1,1637) -LexToken(NUMBER,'-1',1,1638) +LexToken(ADDITION,'-',1,1638) +LexToken(NUMBER,'1',1,1639) LexToken(COMMA,',',1,1640) LexToken(DQSTRING,'"vec"',1,1645) LexToken(COMMA,',',1,1646) -LexToken(NUMBER,'-1',1,1647) +LexToken(ADDITION,'-',1,1647) +LexToken(NUMBER,'1',1,1648) LexToken(CLOSEBRACKET,')',1,1649) LexToken(COMMA,',',1,1650) LexToken(VAR,'exprs',1,1651) @@ -287,12 +296,14 @@ LexToken(SEMICOLON,';',1,2082) LexToken(EOL,'\n',1,2083) LexToken(VAR,'dW',1,2092) LexToken(ASSIGNMENT,'=',1,2094) -LexToken(NUMBER,'-2.5e-6',1,2095) +LexToken(ADDITION,'-',1,2095) +LexToken(NUMBER,'2.5e-6',1,2096) LexToken(SEMICOLON,';',1,2102) LexToken(EOL,'\n',1,2103) LexToken(VAR,'dL',1,2112) LexToken(ASSIGNMENT,'=',1,2114) -LexToken(NUMBER,'-1.5e-6',1,2116) +LexToken(ADDITION,'-',1,2116) +LexToken(NUMBER,'1.5e-6',1,2117) LexToken(SEMICOLON,';',1,2123) LexToken(EOL,'\n',1,2124) LexToken(VAR,'RDS',1,2133) diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 2f0ca464..2c270636 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -354,23 +354,28 @@ LexToken(NUMBER,'0.02',1,2499) LexToken(SEMICOLON,';',1,2503) LexToken(NUMBER,'1.200',1,2504) LexToken(VAR,'D',1,2509) -LexToken(NUMBER,'-10',1,2510) +LexToken(ADDITION,'-',1,2510) +LexToken(NUMBER,'10',1,2511) LexToken(SEMICOLON,';',1,2513) LexToken(NUMBER,'5.000',1,2514) LexToken(VAR,'D',1,2519) -LexToken(NUMBER,'-09',1,2520) +LexToken(ADDITION,'-',1,2520) +LexToken(NUMBER,'09',1,2521) LexToken(SEMICOLON,';',1,2523) LexToken(NUMBER,'1.000',1,2524) LexToken(VAR,'D',1,2529) -LexToken(NUMBER,'-12',1,2530) +LexToken(ADDITION,'-',1,2530) +LexToken(NUMBER,'12',1,2531) LexToken(SEMICOLON,';',1,2533) LexToken(NUMBER,'4.000',1,2534) LexToken(VAR,'D',1,2539) -LexToken(NUMBER,'-13',1,2540) +LexToken(ADDITION,'-',1,2540) +LexToken(NUMBER,'13',1,2541) LexToken(SEMICOLON,';',1,2543) LexToken(NUMBER,'5.000',1,2544) LexToken(VAR,'D',1,2549) -LexToken(NUMBER,'-13',1,2550) +LexToken(ADDITION,'-',1,2550) +LexToken(NUMBER,'13',1,2551) LexToken(SEMICOLON,';',1,2553) LexToken(NUMBER,'0.8',1,2554) LexToken(SEMICOLON,';',1,2557) @@ -382,11 +387,13 @@ LexToken(NUMBER,'0.333',1,2566) LexToken(SEMICOLON,';',1,2571) LexToken(NUMBER,'1.000',1,2572) LexToken(VAR,'D',1,2577) -LexToken(NUMBER,'-15',1,2578) +LexToken(ADDITION,'-',1,2578) +LexToken(NUMBER,'15',1,2579) LexToken(SEMICOLON,';',1,2581) LexToken(NUMBER,'1.000',1,2582) LexToken(VAR,'D',1,2587) -LexToken(NUMBER,'-15',1,2588) +LexToken(ADDITION,'-',1,2588) +LexToken(NUMBER,'15',1,2589) LexToken(SEMICOLON,';',1,2591) LexToken(NUMBER,'0.02585',1,2592) LexToken(SEMICOLON,';',1,2599) @@ -467,7 +474,8 @@ LexToken(NUMBER,'100',1,2841) LexToken(COMMA,',',1,2844) LexToken(NUMBER,'90',1,2845) LexToken(COMMA,',',1,2847) -LexToken(NUMBER,'-2',1,2848) +LexToken(ADDITION,'-',1,2848) +LexToken(NUMBER,'2',1,2849) LexToken(COMMA,',',1,2850) LexToken(NUMBER,'0',1,2851) LexToken(SEMICOLON,';',1,2852) @@ -483,7 +491,8 @@ LexToken(NUMBER,'100',1,2864) LexToken(COMMA,',',1,2867) LexToken(NUMBER,'10',1,2868) LexToken(COMMA,',',1,2870) -LexToken(NUMBER,'-2',1,2871) +LexToken(ADDITION,'-',1,2871) +LexToken(NUMBER,'2',1,2872) LexToken(COMMA,',',1,2873) LexToken(NUMBER,'0',1,2874) LexToken(CLOSESQBRACKET,']',1,2875) @@ -586,7 +595,8 @@ LexToken(COMMA,',',1,3200) LexToken(NUMBER,'3',1,3201) LexToken(CLOSEBRACKET,')',1,3202) LexToken(COMPARISON,'==',1,3203) -LexToken(NUMBER,'-1',1,3205) +LexToken(ADDITION,'-',1,3205) +LexToken(NUMBER,'1',1,3206) LexToken(THEN,'then',1,3208) LexToken(EOL,'\n',1,3212) LexToken(VAR,'Typeout',1,3229) @@ -620,7 +630,8 @@ LexToken(COMMA,',',1,3323) LexToken(NUMBER,'3',1,3324) LexToken(CLOSEBRACKET,')',1,3325) LexToken(COMPARISON,'==',1,3326) -LexToken(NUMBER,'-2',1,3328) +LexToken(ADDITION,'-',1,3328) +LexToken(NUMBER,'2',1,3329) LexToken(THEN,'then',1,3331) LexToken(EOL,'\n',1,3335) LexToken(VAR,'Typeout',1,3352) diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index e0bb3cec..02feeec9 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -143,39 +143,48 @@ LexToken(VAR,'list',1,1558) LexToken(OPENBRACKET,'(',1,1562) LexToken(DQSTRING,'"vec"',1,1567) LexToken(COMMA,',',1,1568) -LexToken(NUMBER,'-1',1,1569) +LexToken(ADDITION,'-',1,1569) +LexToken(NUMBER,'1',1,1570) LexToken(COMMA,',',1,1571) LexToken(DQSTRING,'"vec"',1,1576) LexToken(COMMA,',',1,1577) -LexToken(NUMBER,'-1',1,1578) +LexToken(ADDITION,'-',1,1578) +LexToken(NUMBER,'1',1,1579) LexToken(COMMA,',',1,1580) LexToken(DQSTRING,'"vec"',1,1585) LexToken(COMMA,',',1,1586) -LexToken(NUMBER,'-1',1,1587) +LexToken(ADDITION,'-',1,1587) +LexToken(NUMBER,'1',1,1588) LexToken(COMMA,',',1,1589) LexToken(DQSTRING,'"vec"',1,1594) LexToken(COMMA,',',1,1595) -LexToken(NUMBER,'-1',1,1596) +LexToken(ADDITION,'-',1,1596) +LexToken(NUMBER,'1',1,1597) LexToken(COMMA,',',1,1598) LexToken(DQSTRING,'"vec"',1,1603) LexToken(COMMA,',',1,1604) -LexToken(NUMBER,'-1',1,1605) +LexToken(ADDITION,'-',1,1605) +LexToken(NUMBER,'1',1,1606) LexToken(COMMA,',',1,1607) LexToken(DQSTRING,'"vec"',1,1612) LexToken(COMMA,',',1,1613) -LexToken(NUMBER,'-1',1,1614) +LexToken(ADDITION,'-',1,1614) +LexToken(NUMBER,'1',1,1615) LexToken(COMMA,',',1,1616) LexToken(DQSTRING,'"vec"',1,1621) LexToken(COMMA,',',1,1622) -LexToken(NUMBER,'-1',1,1623) +LexToken(ADDITION,'-',1,1623) +LexToken(NUMBER,'1',1,1624) LexToken(COMMA,',',1,1625) LexToken(DQSTRING,'"vec"',1,1630) LexToken(COMMA,',',1,1631) -LexToken(NUMBER,'-1',1,1632) +LexToken(ADDITION,'-',1,1632) +LexToken(NUMBER,'1',1,1633) LexToken(COMMA,',',1,1634) LexToken(DQSTRING,'"vec"',1,1639) LexToken(COMMA,',',1,1640) -LexToken(NUMBER,'-1',1,1641) +LexToken(ADDITION,'-',1,1641) +LexToken(NUMBER,'1',1,1642) LexToken(CLOSEBRACKET,')',1,1643) LexToken(COMMA,',',1,1644) LexToken(VAR,'exprs',1,1645) @@ -272,7 +281,8 @@ LexToken(SEMICOLON,';',1,2025) LexToken(EOL,'\n',1,2026) LexToken(VAR,'Vt',1,2035) LexToken(ASSIGNMENT,'=',1,2037) -LexToken(NUMBER,'-1',1,2038) +LexToken(ADDITION,'-',1,2038) +LexToken(NUMBER,'1',1,2039) LexToken(SEMICOLON,';',1,2040) LexToken(EOL,'\n',1,2041) LexToken(VAR,'K2',1,2050) @@ -287,12 +297,14 @@ LexToken(SEMICOLON,';',1,2075) LexToken(EOL,'\n',1,2076) LexToken(VAR,'dW',1,2085) LexToken(ASSIGNMENT,'=',1,2087) -LexToken(NUMBER,'-2.5e-6',1,2088) +LexToken(ADDITION,'-',1,2088) +LexToken(NUMBER,'2.5e-6',1,2089) LexToken(SEMICOLON,';',1,2095) LexToken(EOL,'\n',1,2096) LexToken(VAR,'dL',1,2105) LexToken(ASSIGNMENT,'=',1,2107) -LexToken(NUMBER,'-2.1e-6',1,2108) +LexToken(ADDITION,'-',1,2108) +LexToken(NUMBER,'2.1e-6',1,2109) LexToken(SEMICOLON,';',1,2115) LexToken(EOL,'\n',1,2116) LexToken(VAR,'RDS',1,2125) diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 20ba55a1..74e74b17 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -356,23 +356,28 @@ LexToken(NUMBER,'0.02',1,2510) LexToken(SEMICOLON,';',1,2514) LexToken(NUMBER,'1.200',1,2515) LexToken(VAR,'D',1,2520) -LexToken(NUMBER,'-10',1,2521) +LexToken(ADDITION,'-',1,2521) +LexToken(NUMBER,'10',1,2522) LexToken(SEMICOLON,';',1,2524) LexToken(NUMBER,'5.000',1,2525) LexToken(VAR,'D',1,2530) -LexToken(NUMBER,'-09',1,2531) +LexToken(ADDITION,'-',1,2531) +LexToken(NUMBER,'09',1,2532) LexToken(SEMICOLON,';',1,2534) LexToken(NUMBER,'1.000',1,2535) LexToken(VAR,'D',1,2540) -LexToken(NUMBER,'-12',1,2541) +LexToken(ADDITION,'-',1,2541) +LexToken(NUMBER,'12',1,2542) LexToken(SEMICOLON,';',1,2544) LexToken(NUMBER,'4.000',1,2545) LexToken(VAR,'D',1,2550) -LexToken(NUMBER,'-13',1,2551) +LexToken(ADDITION,'-',1,2551) +LexToken(NUMBER,'13',1,2552) LexToken(SEMICOLON,';',1,2554) LexToken(NUMBER,'5.000',1,2555) LexToken(VAR,'D',1,2560) -LexToken(NUMBER,'-13',1,2561) +LexToken(ADDITION,'-',1,2561) +LexToken(NUMBER,'13',1,2562) LexToken(SEMICOLON,';',1,2564) LexToken(NUMBER,'0.8',1,2565) LexToken(SEMICOLON,';',1,2568) @@ -384,11 +389,13 @@ LexToken(NUMBER,'0.333',1,2577) LexToken(SEMICOLON,';',1,2582) LexToken(NUMBER,'1.000',1,2583) LexToken(VAR,'D',1,2588) -LexToken(NUMBER,'-15',1,2589) +LexToken(ADDITION,'-',1,2589) +LexToken(NUMBER,'15',1,2590) LexToken(SEMICOLON,';',1,2592) LexToken(NUMBER,'1.000',1,2593) LexToken(VAR,'D',1,2598) -LexToken(NUMBER,'-15',1,2599) +LexToken(ADDITION,'-',1,2599) +LexToken(NUMBER,'15',1,2600) LexToken(SEMICOLON,';',1,2602) LexToken(NUMBER,'0.02585',1,2603) LexToken(SEMICOLON,';',1,2610) @@ -469,7 +476,8 @@ LexToken(NUMBER,'100',1,2852) LexToken(COMMA,',',1,2855) LexToken(NUMBER,'90',1,2856) LexToken(COMMA,',',1,2858) -LexToken(NUMBER,'-2',1,2859) +LexToken(ADDITION,'-',1,2859) +LexToken(NUMBER,'2',1,2860) LexToken(COMMA,',',1,2861) LexToken(NUMBER,'0',1,2862) LexToken(SEMICOLON,';',1,2863) @@ -485,7 +493,8 @@ LexToken(NUMBER,'100',1,2873) LexToken(COMMA,',',1,2876) LexToken(NUMBER,'10',1,2877) LexToken(COMMA,',',1,2879) -LexToken(NUMBER,'-2',1,2880) +LexToken(ADDITION,'-',1,2880) +LexToken(NUMBER,'2',1,2881) LexToken(COMMA,',',1,2882) LexToken(NUMBER,'0',1,2883) LexToken(CLOSESQBRACKET,']',1,2884) @@ -588,7 +597,8 @@ LexToken(COMMA,',',1,3209) LexToken(NUMBER,'3',1,3210) LexToken(CLOSEBRACKET,')',1,3211) LexToken(COMPARISON,'==',1,3212) -LexToken(NUMBER,'-1',1,3214) +LexToken(ADDITION,'-',1,3214) +LexToken(NUMBER,'1',1,3215) LexToken(THEN,'then',1,3217) LexToken(EOL,'\n',1,3221) LexToken(VAR,'Typeout',1,3238) @@ -622,7 +632,8 @@ LexToken(COMMA,',',1,3332) LexToken(NUMBER,'3',1,3333) LexToken(CLOSEBRACKET,')',1,3334) LexToken(COMPARISON,'==',1,3335) -LexToken(NUMBER,'-2',1,3337) +LexToken(ADDITION,'-',1,3337) +LexToken(NUMBER,'2',1,3338) LexToken(THEN,'then',1,3340) LexToken(EOL,'\n',1,3344) LexToken(VAR,'Typeout',1,3361) diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 4601377f..a87c722f 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -115,7 +115,8 @@ LexToken(VAR,'list',1,1406) LexToken(OPENBRACKET,'(',1,1410) LexToken(DQSTRING,'"vec"',1,1415) LexToken(COMMA,',',1,1416) -LexToken(NUMBER,'-1',1,1417) +LexToken(ADDITION,'-',1,1417) +LexToken(NUMBER,'1',1,1418) LexToken(CLOSEBRACKET,')',1,1419) LexToken(COMMA,',',1,1420) LexToken(VAR,'exprs',1,1421) diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index dc2e87e7..8839bbe0 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -119,11 +119,13 @@ LexToken(VAR,'list',1,1427) LexToken(OPENBRACKET,'(',1,1431) LexToken(DQSTRING,'"vec"',1,1436) LexToken(COMMA,',',1,1437) -LexToken(NUMBER,'-1',1,1438) +LexToken(ADDITION,'-',1,1438) +LexToken(NUMBER,'1',1,1439) LexToken(COMMA,',',1,1440) LexToken(DQSTRING,'"vec"',1,1445) LexToken(COMMA,',',1,1446) -LexToken(NUMBER,'-1',1,1447) +LexToken(ADDITION,'-',1,1447) +LexToken(NUMBER,'1',1,1448) LexToken(CLOSEBRACKET,')',1,1449) LexToken(COMMA,',',1,1450) LexToken(VAR,'exprs',1,1451) diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js index 877897ac..8501ba06 100644 --- a/js/Events/ANDBLK.js +++ b/js/Events/ANDBLK.js @@ -499,7 +499,8 @@ LexToken(ASSIGNMENT,'=',1,2603) LexToken(OPENSQBRACKET,'[',1,2604) LexToken(NUMBER,'5',1,2605) LexToken(COMMA,',',1,2606) -LexToken(NUMBER,'-1',1,2607) +LexToken(ADDITION,'-',1,2607) +LexToken(NUMBER,'1',1,2608) LexToken(CLOSESQBRACKET,']',1,2609) LexToken(COMMA,',',1,2610) LexToken(VAR,'from',1,2611) @@ -562,7 +563,8 @@ LexToken(ASSIGNMENT,'=',1,2754) LexToken(OPENSQBRACKET,'[',1,2755) LexToken(NUMBER,'5',1,2756) LexToken(COMMA,',',1,2757) -LexToken(NUMBER,'-1',1,2758) +LexToken(ADDITION,'-',1,2758) +LexToken(NUMBER,'1',1,2759) LexToken(CLOSESQBRACKET,']',1,2760) LexToken(COMMA,',',1,2761) LexToken(VAR,'from',1,2762) @@ -625,7 +627,8 @@ LexToken(ASSIGNMENT,'=',1,2899) LexToken(OPENSQBRACKET,'[',1,2900) LexToken(NUMBER,'5',1,2901) LexToken(COMMA,',',1,2902) -LexToken(NUMBER,'-1',1,2903) +LexToken(ADDITION,'-',1,2903) +LexToken(NUMBER,'1',1,2904) LexToken(CLOSESQBRACKET,']',1,2905) LexToken(COMMA,',',1,2906) LexToken(VAR,'from',1,2907) @@ -734,7 +737,8 @@ LexToken(ASSIGNMENT,'=',1,3150) LexToken(OPENSQBRACKET,'[',1,3151) LexToken(NUMBER,'5',1,3152) LexToken(COMMA,',',1,3153) -LexToken(NUMBER,'-1',1,3154) +LexToken(ADDITION,'-',1,3154) +LexToken(NUMBER,'1',1,3155) LexToken(CLOSESQBRACKET,']',1,3156) LexToken(COMMA,',',1,3157) LexToken(VAR,'from',1,3158) @@ -788,7 +792,8 @@ LexToken(ASSIGNMENT,'=',1,3273) LexToken(OPENSQBRACKET,'[',1,3274) LexToken(NUMBER,'5',1,3275) LexToken(COMMA,',',1,3276) -LexToken(NUMBER,'-1',1,3277) +LexToken(ADDITION,'-',1,3277) +LexToken(NUMBER,'1',1,3278) LexToken(CLOSESQBRACKET,']',1,3279) LexToken(COMMA,',',1,3280) LexToken(VAR,'from',1,3281) diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index fc849443..fa34db62 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -116,7 +116,8 @@ LexToken(VAR,'model',1,1152) LexToken(DOT,'.',1,1157) LexToken(VAR,'firing',1,1158) LexToken(ASSIGNMENT,'=',1,1164) -LexToken(NUMBER,'-1',1,1165) +LexToken(ADDITION,'-',1,1165) +LexToken(NUMBER,'1',1,1166) LexToken(EOL,'\n',1,1167) LexToken(VAR,'model',1,1176) LexToken(DOT,'.',1,1181) diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 48db5fed..04803495 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -115,7 +115,8 @@ LexToken(VAR,'model',1,1150) LexToken(DOT,'.',1,1155) LexToken(VAR,'firing',1,1156) LexToken(ASSIGNMENT,'=',1,1162) -LexToken(NUMBER,'-1',1,1163) +LexToken(ADDITION,'-',1,1163) +LexToken(NUMBER,'1',1,1164) LexToken(EOL,'\n',1,1165) LexToken(VAR,'model',1,1174) LexToken(DOT,'.',1,1179) @@ -140,7 +141,7 @@ LexToken(OPENSQBRACKET,'[',1,1238) LexToken(NUMBER,'1',1,1239) LexToken(NUMBER,'1',1,1241) LexToken(CLOSESQBRACKET,']',1,1242) -LexToken(OPERATOR,'/',1,1243) +LexToken(MULTIPLICATION,'/',1,1243) LexToken(NUMBER,'1.2',1,1244) LexToken(COMMA,',',1,1247) LexToken(VAR,'model',1,1248) diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 3bf50ede..bdb3ebee 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -141,7 +141,7 @@ LexToken(OPENSQBRACKET,'[',1,1402) LexToken(NUMBER,'1',1,1403) LexToken(NUMBER,'1',1,1405) LexToken(CLOSESQBRACKET,']',1,1406) -LexToken(OPERATOR,'/',1,1407) +LexToken(MULTIPLICATION,'/',1,1407) LexToken(NUMBER,'3',1,1408) LexToken(COMMA,',',1,1409) LexToken(VAR,'model',1,1410) diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 9ea7b798..47c36b39 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -203,7 +203,8 @@ LexToken(VAR,'model',1,1648) LexToken(DOT,'.',1,1653) LexToken(VAR,'firing',1,1654) LexToken(ASSIGNMENT,'=',1,1660) -LexToken(NUMBER,'-1',1,1661) +LexToken(ADDITION,'-',1,1661) +LexToken(NUMBER,'1',1,1662) LexToken(EOL,'\n',1,1663) LexToken(VAR,'model',1,1672) LexToken(DOT,'.',1,1677) diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 20b85e59..75b2112b 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -266,7 +266,8 @@ LexToken(OPENBRACKET,'(',1,1836) LexToken(NUMBER,'2',1,1837) LexToken(CLOSEBRACKET,')',1,1838) LexToken(ASSIGNMENT,'=',1,1839) -LexToken(NUMBER,'-1',1,1840) +LexToken(ADDITION,'-',1,1840) +LexToken(NUMBER,'1',1,1841) LexToken(EOL,'\n',1,1842) LexToken(VAR,'model',1,1859) LexToken(DOT,'.',1,1864) @@ -317,7 +318,8 @@ LexToken(VAR,'list',1,2098) LexToken(OPENBRACKET,'(',1,2102) LexToken(DQSTRING,'"ifthel"',1,2110) LexToken(COMMA,',',1,2111) -LexToken(NUMBER,'-1',1,2112) +LexToken(ADDITION,'-',1,2112) +LexToken(NUMBER,'1',1,2113) LexToken(CLOSEBRACKET,')',1,2114) LexToken(EOL,'\n',1,2115) LexToken(VAR,'model',1,2124) @@ -336,7 +338,8 @@ LexToken(VAR,'model',1,2163) LexToken(DOT,'.',1,2168) LexToken(VAR,'intyp',1,2169) LexToken(ASSIGNMENT,'=',1,2174) -LexToken(NUMBER,'-1',1,2175) +LexToken(ADDITION,'-',1,2175) +LexToken(NUMBER,'1',1,2176) LexToken(EOL,'\n',1,2177) LexToken(VAR,'model',1,2186) LexToken(DOT,'.',1,2191) @@ -365,8 +368,10 @@ LexToken(DOT,'.',1,2268) LexToken(VAR,'firing',1,2269) LexToken(ASSIGNMENT,'=',1,2275) LexToken(OPENSQBRACKET,'[',1,2276) -LexToken(NUMBER,'-1',1,2277) -LexToken(NUMBER,'-1',1,2280) +LexToken(ADDITION,'-',1,2277) +LexToken(NUMBER,'1',1,2278) +LexToken(ADDITION,'-',1,2280) +LexToken(NUMBER,'1',1,2281) LexToken(CLOSESQBRACKET,']',1,2282) LexToken(EOL,'\n',1,2283) LexToken(VAR,'model',1,2292) diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index 8b1e8ff6..ddb41a4e 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -152,11 +152,11 @@ LexToken(EOL,'\n',1,1317) LexToken(VAR,'execstr',1,1326) LexToken(OPENBRACKET,'(',1,1333) LexToken(DQSTRING,'"xxn="',1,1339) -LexToken(OPERATOR,'+',1,1340) +LexToken(ADDITION,'+',1,1340) LexToken(VAR,'xx',1,1341) LexToken(DOT,'.',1,1343) LexToken(VAR,'gui',1,1344) -LexToken(OPERATOR,'+',1,1347) +LexToken(ADDITION,'+',1,1347) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1361) LexToken(CLOSEBRACKET,')',1,1362) LexToken(EOL,'\n',1,1363) @@ -183,7 +183,7 @@ LexToken(VAR,'size',1,1491) LexToken(OPENBRACKET,'(',1,1495) LexToken(VAR,'newpar',1,1496) LexToken(CLOSEBRACKET,')',1,1502) -LexToken(OPERATOR,'+',1,1503) +LexToken(ADDITION,'+',1,1503) LexToken(NUMBER,'1',1,1504) LexToken(CLOSEBRACKET,')',1,1505) LexToken(ASSIGNMENT,'=',1,1506) @@ -320,7 +320,8 @@ LexToken(DOT,'.',1,2005) LexToken(VAR,'firing',1,2006) LexToken(ASSIGNMENT,'=',1,2012) LexToken(OPENSQBRACKET,'[',1,2013) -LexToken(NUMBER,'-1',1,2014) +LexToken(ADDITION,'-',1,2014) +LexToken(NUMBER,'1',1,2015) LexToken(NUMBER,'0',1,2017) LexToken(CLOSESQBRACKET,']',1,2018) LexToken(EOL,'\n',1,2019) @@ -674,7 +675,8 @@ LexToken(ASSIGNMENT,'=',1,3377) LexToken(OPENSQBRACKET,'[',1,3378) LexToken(NUMBER,'10',1,3379) LexToken(COMMA,',',1,3381) -LexToken(NUMBER,'-1',1,3382) +LexToken(ADDITION,'-',1,3382) +LexToken(NUMBER,'1',1,3383) LexToken(CLOSESQBRACKET,']',1,3384) LexToken(COMMA,',',1,3385) LexToken(VAR,'from',1,3386) @@ -732,7 +734,8 @@ LexToken(ASSIGNMENT,'=',1,3523) LexToken(OPENSQBRACKET,'[',1,3524) LexToken(NUMBER,'10',1,3525) LexToken(COMMA,',',1,3527) -LexToken(NUMBER,'-1',1,3528) +LexToken(ADDITION,'-',1,3528) +LexToken(NUMBER,'1',1,3529) LexToken(CLOSESQBRACKET,']',1,3530) LexToken(COMMA,',',1,3531) LexToken(VAR,'from',1,3532) @@ -782,7 +785,8 @@ LexToken(ASSIGNMENT,'=',1,3636) LexToken(OPENSQBRACKET,'[',1,3637) LexToken(NUMBER,'10',1,3638) LexToken(COMMA,',',1,3640) -LexToken(NUMBER,'-1',1,3641) +LexToken(ADDITION,'-',1,3641) +LexToken(NUMBER,'1',1,3642) LexToken(CLOSESQBRACKET,']',1,3643) LexToken(COMMA,',',1,3644) LexToken(VAR,'from',1,3645) @@ -861,7 +865,8 @@ LexToken(ASSIGNMENT,'=',1,3866) LexToken(OPENSQBRACKET,'[',1,3867) LexToken(NUMBER,'10',1,3868) LexToken(COMMA,',',1,3870) -LexToken(NUMBER,'-1',1,3871) +LexToken(ADDITION,'-',1,3871) +LexToken(NUMBER,'1',1,3872) LexToken(CLOSESQBRACKET,']',1,3873) LexToken(COMMA,',',1,3874) LexToken(VAR,'from',1,3875) @@ -915,7 +920,8 @@ LexToken(ASSIGNMENT,'=',1,3986) LexToken(OPENSQBRACKET,'[',1,3987) LexToken(NUMBER,'10',1,3988) LexToken(COMMA,',',1,3990) -LexToken(NUMBER,'-1',1,3991) +LexToken(ADDITION,'-',1,3991) +LexToken(NUMBER,'1',1,3992) LexToken(CLOSESQBRACKET,']',1,3993) LexToken(COMMA,',',1,3994) LexToken(VAR,'from',1,3995) @@ -988,7 +994,8 @@ LexToken(ASSIGNMENT,'=',1,4177) LexToken(OPENSQBRACKET,'[',1,4178) LexToken(NUMBER,'10',1,4179) LexToken(COMMA,',',1,4181) -LexToken(NUMBER,'-1',1,4182) +LexToken(ADDITION,'-',1,4182) +LexToken(NUMBER,'1',1,4183) LexToken(CLOSESQBRACKET,']',1,4184) LexToken(COMMA,',',1,4185) LexToken(VAR,'from',1,4186) @@ -1042,7 +1049,8 @@ LexToken(ASSIGNMENT,'=',1,4298) LexToken(OPENSQBRACKET,'[',1,4299) LexToken(NUMBER,'10',1,4300) LexToken(COMMA,',',1,4302) -LexToken(NUMBER,'-1',1,4303) +LexToken(ADDITION,'-',1,4303) +LexToken(NUMBER,'1',1,4304) LexToken(CLOSESQBRACKET,']',1,4305) LexToken(COMMA,',',1,4306) LexToken(VAR,'from',1,4307) diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index ac90832e..534856de 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -249,7 +249,8 @@ LexToken(DOT,'.',1,1740) LexToken(VAR,'firing',1,1741) LexToken(ASSIGNMENT,'=',1,1747) LexToken(OPENSQBRACKET,'[',1,1748) -LexToken(NUMBER,'-1',1,1749) +LexToken(ADDITION,'-',1,1749) +LexToken(NUMBER,'1',1,1750) LexToken(NUMBER,'0',1,1752) LexToken(CLOSESQBRACKET,']',1,1753) LexToken(EOL,'\n',1,1754) diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 8a2ee702..3b3e4253 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -115,11 +115,13 @@ LexToken(VAR,'list',1,1194) LexToken(OPENBRACKET,'(',1,1198) LexToken(DQSTRING,'"vec"',1,1203) LexToken(COMMA,',',1,1204) -LexToken(NUMBER,'-1',1,1205) +LexToken(ADDITION,'-',1,1205) +LexToken(NUMBER,'1',1,1206) LexToken(COMMA,',',1,1207) LexToken(DQSTRING,'"vec"',1,1212) LexToken(COMMA,',',1,1213) -LexToken(NUMBER,'-1',1,1214) +LexToken(ADDITION,'-',1,1214) +LexToken(NUMBER,'1',1,1215) LexToken(CLOSEBRACKET,')',1,1216) LexToken(COMMA,',',1,1217) LexToken(VAR,'exprs',1,1218) @@ -286,8 +288,8 @@ LexToken(VAR,'mn',1,1999) LexToken(ASSIGNMENT,'=',1,2001) LexToken(OPENBRACKET,'(',1,2002) LexToken(NUMBER,'2',1,2003) -LexToken(OPERATOR,'*',1,2004) -LexToken(OPERATOR,'*',1,2005) +LexToken(MULTIPLICATION,'*',1,2004) +LexToken(MULTIPLICATION,'*',1,2005) LexToken(VAR,'size',1,2006) LexToken(OPENBRACKET,'(',1,2010) LexToken(VAR,'m1',1,2011) @@ -295,7 +297,8 @@ LexToken(COMMA,',',1,2013) LexToken(DQSTRING,'"*"',1,2016) LexToken(CLOSEBRACKET,')',1,2017) LexToken(CLOSEBRACKET,')',1,2018) -LexToken(NUMBER,'-1',1,2019) +LexToken(ADDITION,'-',1,2019) +LexToken(NUMBER,'1',1,2020) LexToken(SEMICOLON,';',1,2021) LexToken(EOL,'\n',1,2022) LexToken(OPENSQBRACKET,'[',1,2039) @@ -342,12 +345,13 @@ LexToken(VAR,'sz',1,2167) LexToken(ASSIGNMENT,'=',1,2169) LexToken(OPENSQBRACKET,'[',1,2170) LexToken(NUMBER,'40',1,2171) -LexToken(OPERATOR,'+',1,2173) +LexToken(ADDITION,'+',1,2173) LexToken(OPENBRACKET,'(',1,2174) LexToken(VAR,'mn',1,2175) -LexToken(NUMBER,'-3',1,2177) +LexToken(ADDITION,'-',1,2177) +LexToken(NUMBER,'3',1,2178) LexToken(CLOSEBRACKET,')',1,2179) -LexToken(OPERATOR,'*',1,2180) +LexToken(MULTIPLICATION,'*',1,2180) LexToken(NUMBER,'10',1,2181) LexToken(NUMBER,'40',1,2184) LexToken(CLOSESQBRACKET,']',1,2186) @@ -482,8 +486,10 @@ LexToken(VAR,'firing',1,2711) LexToken(ASSIGNMENT,'=',1,2717) LexToken(OPENSQBRACKET,'[',1,2718) LexToken(NUMBER,'0',1,2719) -LexToken(NUMBER,'-1',1,2721) -LexToken(NUMBER,'-1',1,2724) +LexToken(ADDITION,'-',1,2721) +LexToken(NUMBER,'1',1,2722) +LexToken(ADDITION,'-',1,2724) +LexToken(NUMBER,'1',1,2725) LexToken(CLOSESQBRACKET,']',1,2726) LexToken(EOL,'\n',1,2727) LexToken(VAR,'model',1,2736) diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index c06df50e..b338ed60 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -114,7 +114,8 @@ LexToken(VAR,'model',1,1170) LexToken(DOT,'.',1,1175) LexToken(VAR,'firing',1,1176) LexToken(ASSIGNMENT,'=',1,1182) -LexToken(NUMBER,'-1',1,1183) +LexToken(ADDITION,'-',1,1183) +LexToken(NUMBER,'1',1,1184) LexToken(EOL,'\n',1,1185) LexToken(VAR,'model',1,1194) LexToken(DOT,'.',1,1199) diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 66236420..425710b2 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -144,7 +144,7 @@ LexToken(EOL,'\n',1,1321) LexToken(VAR,'spath',1,1330) LexToken(OPENBRACKET,'(',1,1335) LexToken(LASTINDEX,'$',1,1336) -LexToken(OPERATOR,'+',1,1337) +LexToken(ADDITION,'+',1,1337) LexToken(NUMBER,'1',1,1338) LexToken(CLOSEBRACKET,')',1,1339) LexToken(ASSIGNMENT,'=',1,1340) @@ -153,7 +153,7 @@ LexToken(EOL,'\n',1,1348) LexToken(VAR,'spath',1,1357) LexToken(OPENBRACKET,'(',1,1362) LexToken(LASTINDEX,'$',1,1363) -LexToken(OPERATOR,'+',1,1364) +LexToken(ADDITION,'+',1,1364) LexToken(NUMBER,'1',1,1365) LexToken(CLOSEBRACKET,')',1,1366) LexToken(ASSIGNMENT,'=',1,1367) @@ -162,7 +162,7 @@ LexToken(EOL,'\n',1,1374) LexToken(VAR,'spath',1,1383) LexToken(OPENBRACKET,'(',1,1388) LexToken(LASTINDEX,'$',1,1389) -LexToken(OPERATOR,'+',1,1390) +LexToken(ADDITION,'+',1,1390) LexToken(NUMBER,'1',1,1391) LexToken(CLOSEBRACKET,')',1,1392) LexToken(ASSIGNMENT,'=',1,1393) @@ -171,7 +171,7 @@ LexToken(EOL,'\n',1,1400) LexToken(VAR,'spath',1,1409) LexToken(OPENBRACKET,'(',1,1414) LexToken(LASTINDEX,'$',1,1415) -LexToken(OPERATOR,'+',1,1416) +LexToken(ADDITION,'+',1,1416) LexToken(NUMBER,'1',1,1417) LexToken(CLOSEBRACKET,')',1,1418) LexToken(ASSIGNMENT,'=',1,1419) @@ -287,13 +287,15 @@ LexToken(IF,'if',1,2057) LexToken(PREVAR,'%ph',1,2060) LexToken(COMPARISON,'>',1,2063) LexToken(PREVAR,'%df',1,2064) -LexToken(NUMBER,'-1',1,2067) +LexToken(ADDITION,'-',1,2067) +LexToken(NUMBER,'1',1,2068) LexToken(THEN,'then',1,2070) LexToken(EOL,'\n',1,2074) LexToken(PREVAR,'%ph',1,2095) LexToken(ASSIGNMENT,'=',1,2098) LexToken(PREVAR,'%df',1,2099) -LexToken(NUMBER,'-1',1,2102) +LexToken(ADDITION,'-',1,2102) +LexToken(NUMBER,'1',1,2103) LexToken(COMMA,',',1,2104) LexToken(EOL,'\n',1,2105) LexToken(END,'end',1,2122) @@ -712,7 +714,7 @@ LexToken(VAR,'size',1,4250) LexToken(OPENBRACKET,'(',1,4254) LexToken(VAR,'newpar',1,4255) LexToken(CLOSEBRACKET,')',1,4261) -LexToken(OPERATOR,'+',1,4262) +LexToken(ADDITION,'+',1,4262) LexToken(NUMBER,'1',1,4263) LexToken(CLOSEBRACKET,')',1,4264) LexToken(ASSIGNMENT,'=',1,4265) @@ -906,7 +908,8 @@ LexToken(VAR,'orig',1,5003) LexToken(ASSIGNMENT,'=',1,5008) LexToken(OPENSQBRACKET,'[',1,5010) LexToken(NUMBER,'0',1,5011) -LexToken(NUMBER,'-100',1,5013) +LexToken(ADDITION,'-',1,5013) +LexToken(NUMBER,'100',1,5014) LexToken(CLOSESQBRACKET,']',1,5017) LexToken(SEMICOLON,';',1,5018) LexToken(EOL,'\n',1,5019) @@ -1116,7 +1119,8 @@ LexToken(VAR,'orig',1,5772) LexToken(ASSIGNMENT,'=',1,5777) LexToken(OPENSQBRACKET,'[',1,5779) LexToken(NUMBER,'130',1,5780) -LexToken(NUMBER,'-160',1,5784) +LexToken(ADDITION,'-',1,5784) +LexToken(NUMBER,'160',1,5785) LexToken(CLOSESQBRACKET,']',1,5788) LexToken(SEMICOLON,';',1,5789) LexToken(EOL,'\n',1,5790) @@ -1213,7 +1217,8 @@ LexToken(VAR,'orig',1,6129) LexToken(ASSIGNMENT,'=',1,6134) LexToken(OPENSQBRACKET,'[',1,6136) LexToken(NUMBER,'100',1,6137) -LexToken(NUMBER,'-100',1,6141) +LexToken(ADDITION,'-',1,6141) +LexToken(NUMBER,'100',1,6142) LexToken(CLOSESQBRACKET,']',1,6145) LexToken(SEMICOLON,';',1,6146) LexToken(EOL,'\n',1,6147) @@ -1330,7 +1335,8 @@ LexToken(VAR,'orig',1,6550) LexToken(ASSIGNMENT,'=',1,6555) LexToken(OPENSQBRACKET,'[',1,6557) LexToken(NUMBER,'127',1,6558) -LexToken(NUMBER,'-33',1,6562) +LexToken(ADDITION,'-',1,6562) +LexToken(NUMBER,'33',1,6563) LexToken(CLOSESQBRACKET,']',1,6565) LexToken(SEMICOLON,';',1,6566) LexToken(EOL,'\n',1,6567) @@ -1407,7 +1413,8 @@ LexToken(VAR,'ct',1,6829) LexToken(ASSIGNMENT,'=',1,6832) LexToken(OPENSQBRACKET,'[',1,6834) LexToken(NUMBER,'5',1,6835) -LexToken(NUMBER,'-1',1,6837) +LexToken(ADDITION,'-',1,6837) +LexToken(NUMBER,'1',1,6838) LexToken(CLOSESQBRACKET,']',1,6839) LexToken(SEMICOLON,';',1,6840) LexToken(EOL,'\n',1,6841) @@ -1509,7 +1516,8 @@ LexToken(VAR,'ct',1,7161) LexToken(ASSIGNMENT,'=',1,7164) LexToken(OPENSQBRACKET,'[',1,7166) LexToken(NUMBER,'5',1,7167) -LexToken(NUMBER,'-1',1,7169) +LexToken(ADDITION,'-',1,7169) +LexToken(NUMBER,'1',1,7170) LexToken(CLOSESQBRACKET,']',1,7171) LexToken(SEMICOLON,';',1,7172) LexToken(EOL,'\n',1,7173) @@ -1565,7 +1573,8 @@ LexToken(VAR,'ct',1,7339) LexToken(ASSIGNMENT,'=',1,7342) LexToken(OPENSQBRACKET,'[',1,7344) LexToken(NUMBER,'5',1,7345) -LexToken(NUMBER,'-1',1,7347) +LexToken(ADDITION,'-',1,7347) +LexToken(NUMBER,'1',1,7348) LexToken(CLOSESQBRACKET,']',1,7349) LexToken(SEMICOLON,';',1,7350) LexToken(EOL,'\n',1,7351) @@ -1632,7 +1641,8 @@ LexToken(VAR,'yy',1,7549) LexToken(ASSIGNMENT,'=',1,7552) LexToken(OPENSQBRACKET,'[',1,7554) LexToken(NUMBER,'0',1,7555) -LexToken(NUMBER,'-30',1,7557) +LexToken(ADDITION,'-',1,7557) +LexToken(NUMBER,'30',1,7558) LexToken(NUMBER,'1',1,7561) LexToken(CLOSESQBRACKET,']',1,7562) LexToken(SEMICOLON,';',1,7563) @@ -1644,7 +1654,8 @@ LexToken(VAR,'ct',1,7578) LexToken(ASSIGNMENT,'=',1,7581) LexToken(OPENSQBRACKET,'[',1,7583) LexToken(NUMBER,'5',1,7584) -LexToken(NUMBER,'-1',1,7586) +LexToken(ADDITION,'-',1,7586) +LexToken(NUMBER,'1',1,7587) LexToken(CLOSESQBRACKET,']',1,7588) LexToken(SEMICOLON,';',1,7589) LexToken(EOL,'\n',1,7590) diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 6a7fbcef..2f1de7d4 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -129,508 +129,517 @@ LexToken(DQSTRING,'"Pression dans le ciel de la bache : Patm (Pa)"',1,1442) LexToken(SEMICOLON,';',1,1443) LexToken(DQSTRING,'"Section de la bache : A (m2)"',1,1488) LexToken(SEMICOLON,';',1,1489) -LexToken(DQSTRING,'"Altitude du piquage d entrée 1: ze1 (m)"',1,1545) -LexToken(SEMICOLON,';',1,1546) -LexToken(DQSTRING,'"Altitude du piquage d entrée 2: ze2 (m)"',1,1602) -LexToken(SEMICOLON,';',1,1603) -LexToken(DQSTRING,'"Altitude du piquage de sortie 1: zs1 (m)"',1,1660) -LexToken(SEMICOLON,';',1,1661) -LexToken(DQSTRING,'"Altitude du piquage de sortie 2: zs2 (m)"',1,1718) -LexToken(SEMICOLON,';',1,1719) -LexToken(DQSTRING,'"Altitude initiale du fluide : z0 (m)"',1,1772) -LexToken(SEMICOLON,';',1,1773) -LexToken(DQSTRING,'"Température initiale du fluide : T0 (K)"',1,1829) -LexToken(SEMICOLON,';',1,1830) -LexToken(DQSTRING,'"Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"',1,1903) -LexToken(CLOSESQBRACKET,']',1,1904) -LexToken(COMMA,',',1,1905) -LexToken(VAR,'list',1,1921) -LexToken(OPENBRACKET,'(',1,1925) -LexToken(DQSTRING,'"vec"',1,1930) -LexToken(COMMA,',',1,1931) -LexToken(NUMBER,'-1',1,1932) -LexToken(COMMA,',',1,1934) -LexToken(DQSTRING,'"vec"',1,1939) -LexToken(COMMA,',',1,1940) -LexToken(NUMBER,'-1',1,1941) -LexToken(COMMA,',',1,1943) -LexToken(DQSTRING,'"vec"',1,1948) -LexToken(COMMA,',',1,1949) -LexToken(NUMBER,'-1',1,1950) -LexToken(COMMA,',',1,1952) -LexToken(DQSTRING,'"vec"',1,1957) -LexToken(COMMA,',',1,1958) -LexToken(NUMBER,'-1',1,1959) -LexToken(COMMA,',',1,1961) -LexToken(DQSTRING,'"vec"',1,1966) -LexToken(COMMA,',',1,1967) -LexToken(NUMBER,'-1',1,1968) -LexToken(COMMA,',',1,1970) -LexToken(DQSTRING,'"vec"',1,1975) -LexToken(COMMA,',',1,1976) -LexToken(NUMBER,'-1',1,1977) -LexToken(COMMA,',',1,1979) -LexToken(DQSTRING,'"vec"',1,1984) -LexToken(COMMA,',',1,1985) -LexToken(NUMBER,'-1',1,1986) -LexToken(COMMA,',',1,1988) -LexToken(DQSTRING,'"vec"',1,1993) -LexToken(COMMA,',',1,1994) -LexToken(NUMBER,'-1',1,1995) -LexToken(COMMA,',',1,1997) -LexToken(DQSTRING,'"vec"',1,2002) -LexToken(COMMA,',',1,2003) -LexToken(NUMBER,'-1',1,2004) -LexToken(CLOSEBRACKET,')',1,2006) +LexToken(DQSTRING,'"Altitude du piquage d entr\xc3\xa9e 1: ze1 (m)"',1,1546) +LexToken(SEMICOLON,';',1,1547) +LexToken(DQSTRING,'"Altitude du piquage d entr\xc3\xa9e 2: ze2 (m)"',1,1604) +LexToken(SEMICOLON,';',1,1605) +LexToken(DQSTRING,'"Altitude du piquage de sortie 1: zs1 (m)"',1,1662) +LexToken(SEMICOLON,';',1,1663) +LexToken(DQSTRING,'"Altitude du piquage de sortie 2: zs2 (m)"',1,1720) +LexToken(SEMICOLON,';',1,1721) +LexToken(DQSTRING,'"Altitude initiale du fluide : z0 (m)"',1,1774) +LexToken(SEMICOLON,';',1,1775) +LexToken(DQSTRING,'"Temp\xc3\xa9rature initiale du fluide : T0 (K)"',1,1832) +LexToken(SEMICOLON,';',1,1833) +LexToken(DQSTRING,'"Si >0, masse volumique impos\xc3\xa9e du fluide : p_rho (kg/m3)"',1,1907) +LexToken(CLOSESQBRACKET,']',1,1908) +LexToken(COMMA,',',1,1909) +LexToken(VAR,'list',1,1925) +LexToken(OPENBRACKET,'(',1,1929) +LexToken(DQSTRING,'"vec"',1,1934) +LexToken(COMMA,',',1,1935) +LexToken(ADDITION,'-',1,1936) +LexToken(NUMBER,'1',1,1937) +LexToken(COMMA,',',1,1938) +LexToken(DQSTRING,'"vec"',1,1943) +LexToken(COMMA,',',1,1944) +LexToken(ADDITION,'-',1,1945) +LexToken(NUMBER,'1',1,1946) +LexToken(COMMA,',',1,1947) +LexToken(DQSTRING,'"vec"',1,1952) +LexToken(COMMA,',',1,1953) +LexToken(ADDITION,'-',1,1954) +LexToken(NUMBER,'1',1,1955) +LexToken(COMMA,',',1,1956) +LexToken(DQSTRING,'"vec"',1,1961) +LexToken(COMMA,',',1,1962) +LexToken(ADDITION,'-',1,1963) +LexToken(NUMBER,'1',1,1964) +LexToken(COMMA,',',1,1965) +LexToken(DQSTRING,'"vec"',1,1970) +LexToken(COMMA,',',1,1971) +LexToken(ADDITION,'-',1,1972) +LexToken(NUMBER,'1',1,1973) +LexToken(COMMA,',',1,1974) +LexToken(DQSTRING,'"vec"',1,1979) +LexToken(COMMA,',',1,1980) +LexToken(ADDITION,'-',1,1981) +LexToken(NUMBER,'1',1,1982) +LexToken(COMMA,',',1,1983) +LexToken(DQSTRING,'"vec"',1,1988) +LexToken(COMMA,',',1,1989) +LexToken(ADDITION,'-',1,1990) +LexToken(NUMBER,'1',1,1991) +LexToken(COMMA,',',1,1992) +LexToken(DQSTRING,'"vec"',1,1997) +LexToken(COMMA,',',1,1998) +LexToken(ADDITION,'-',1,1999) +LexToken(NUMBER,'1',1,2000) +LexToken(COMMA,',',1,2001) +LexToken(DQSTRING,'"vec"',1,2006) LexToken(COMMA,',',1,2007) -LexToken(VAR,'exprs',1,2008) -LexToken(CLOSEBRACKET,')',1,2013) -LexToken(EOL,'\n',1,2014) -LexToken(EOL,'\n',1,2015) -LexToken(EOL,'\n',1,2016) -LexToken(IF,'if',1,2029) -LexToken(NOT,'~',1,2032) -LexToken(VAR,'ok',1,2033) -LexToken(THEN,'then',1,2036) -LexToken(EOL,'\n',1,2040) -LexToken(BREAK,'break',1,2057) -LexToken(COMMA,',',1,2062) -LexToken(EOL,'\n',1,2063) -LexToken(END,'end',1,2076) -LexToken(EOL,'\n',1,2079) -LexToken(VAR,'model',1,2092) -LexToken(DOT,'.',1,2097) -LexToken(VAR,'rpar',1,2098) -LexToken(ASSIGNMENT,'=',1,2102) -LexToken(OPENSQBRACKET,'[',1,2103) -LexToken(VAR,'Patm',1,2104) -LexToken(SEMICOLON,';',1,2108) -LexToken(VAR,'A',1,2109) -LexToken(SEMICOLON,';',1,2110) -LexToken(VAR,'ze1',1,2111) +LexToken(ADDITION,'-',1,2008) +LexToken(NUMBER,'1',1,2009) +LexToken(CLOSEBRACKET,')',1,2010) +LexToken(COMMA,',',1,2011) +LexToken(VAR,'exprs',1,2012) +LexToken(CLOSEBRACKET,')',1,2017) +LexToken(EOL,'\n',1,2018) +LexToken(EOL,'\n',1,2019) +LexToken(EOL,'\n',1,2020) +LexToken(IF,'if',1,2033) +LexToken(NOT,'~',1,2036) +LexToken(VAR,'ok',1,2037) +LexToken(THEN,'then',1,2040) +LexToken(EOL,'\n',1,2044) +LexToken(BREAK,'break',1,2061) +LexToken(COMMA,',',1,2066) +LexToken(EOL,'\n',1,2067) +LexToken(END,'end',1,2080) +LexToken(EOL,'\n',1,2083) +LexToken(VAR,'model',1,2096) +LexToken(DOT,'.',1,2101) +LexToken(VAR,'rpar',1,2102) +LexToken(ASSIGNMENT,'=',1,2106) +LexToken(OPENSQBRACKET,'[',1,2107) +LexToken(VAR,'Patm',1,2108) +LexToken(SEMICOLON,';',1,2112) +LexToken(VAR,'A',1,2113) LexToken(SEMICOLON,';',1,2114) -LexToken(VAR,'ze2',1,2115) +LexToken(VAR,'ze1',1,2115) LexToken(SEMICOLON,';',1,2118) -LexToken(VAR,'zs1',1,2119) +LexToken(VAR,'ze2',1,2119) LexToken(SEMICOLON,';',1,2122) -LexToken(VAR,'zs2',1,2123) +LexToken(VAR,'zs1',1,2123) LexToken(SEMICOLON,';',1,2126) -LexToken(VAR,'z0',1,2127) -LexToken(SEMICOLON,';',1,2129) -LexToken(VAR,'T0',1,2130) -LexToken(SEMICOLON,';',1,2132) -LexToken(VAR,'p_rho',1,2133) -LexToken(CLOSESQBRACKET,']',1,2138) -LexToken(EOL,'\n',1,2139) -LexToken(VAR,'model',1,2152) -LexToken(DOT,'.',1,2157) -LexToken(VAR,'equations',1,2158) -LexToken(DOT,'.',1,2167) -LexToken(VAR,'parameters',1,2168) -LexToken(OPENBRACKET,'(',1,2178) -LexToken(NUMBER,'2',1,2179) -LexToken(CLOSEBRACKET,')',1,2180) -LexToken(ASSIGNMENT,'=',1,2181) -LexToken(VAR,'list',1,2182) -LexToken(OPENBRACKET,'(',1,2186) -LexToken(VAR,'Patm',1,2187) -LexToken(COMMA,',',1,2191) -LexToken(VAR,'A',1,2192) -LexToken(COMMA,',',1,2193) -LexToken(VAR,'ze1',1,2194) +LexToken(VAR,'zs2',1,2127) +LexToken(SEMICOLON,';',1,2130) +LexToken(VAR,'z0',1,2131) +LexToken(SEMICOLON,';',1,2133) +LexToken(VAR,'T0',1,2134) +LexToken(SEMICOLON,';',1,2136) +LexToken(VAR,'p_rho',1,2137) +LexToken(CLOSESQBRACKET,']',1,2142) +LexToken(EOL,'\n',1,2143) +LexToken(VAR,'model',1,2156) +LexToken(DOT,'.',1,2161) +LexToken(VAR,'equations',1,2162) +LexToken(DOT,'.',1,2171) +LexToken(VAR,'parameters',1,2172) +LexToken(OPENBRACKET,'(',1,2182) +LexToken(NUMBER,'2',1,2183) +LexToken(CLOSEBRACKET,')',1,2184) +LexToken(ASSIGNMENT,'=',1,2185) +LexToken(VAR,'list',1,2186) +LexToken(OPENBRACKET,'(',1,2190) +LexToken(VAR,'Patm',1,2191) +LexToken(COMMA,',',1,2195) +LexToken(VAR,'A',1,2196) LexToken(COMMA,',',1,2197) -LexToken(VAR,'ze2',1,2198) +LexToken(VAR,'ze1',1,2198) LexToken(COMMA,',',1,2201) -LexToken(VAR,'zs1',1,2202) +LexToken(VAR,'ze2',1,2202) LexToken(COMMA,',',1,2205) -LexToken(VAR,'zs2',1,2206) +LexToken(VAR,'zs1',1,2206) LexToken(COMMA,',',1,2209) -LexToken(VAR,'z0',1,2210) -LexToken(COMMA,',',1,2212) -LexToken(VAR,'T0',1,2213) -LexToken(COMMA,',',1,2215) -LexToken(VAR,'p_rho',1,2216) -LexToken(CLOSEBRACKET,')',1,2221) -LexToken(EOL,'\n',1,2222) -LexToken(VAR,'graphics',1,2235) -LexToken(DOT,'.',1,2243) -LexToken(VAR,'exprs',1,2244) -LexToken(ASSIGNMENT,'=',1,2249) -LexToken(VAR,'exprs',1,2250) -LexToken(EOL,'\n',1,2255) -LexToken(VAR,'x',1,2268) -LexToken(DOT,'.',1,2269) -LexToken(VAR,'graphics',1,2270) -LexToken(ASSIGNMENT,'=',1,2278) -LexToken(VAR,'graphics',1,2279) -LexToken(SEMICOLON,';',1,2287) -LexToken(EOL,'\n',1,2288) -LexToken(VAR,'x',1,2301) -LexToken(DOT,'.',1,2302) -LexToken(VAR,'model',1,2303) -LexToken(ASSIGNMENT,'=',1,2308) -LexToken(VAR,'model',1,2309) -LexToken(EOL,'\n',1,2314) -LexToken(BREAK,'break',1,2327) -LexToken(EOL,'\n',1,2332) -LexToken(END,'end',1,2341) -LexToken(EOL,'\n',1,2344) -LexToken(CASE,'case',1,2349) -LexToken(DQSTRING,'"define"',1,2361) -LexToken(THEN,'then',1,2363) -LexToken(EOL,'\n',1,2367) -LexToken(VAR,'in',1,2376) -LexToken(ASSIGNMENT,'=',1,2378) -LexToken(NUMBER,'2',1,2379) -LexToken(EOL,'\n',1,2380) -LexToken(VAR,'out',1,2389) -LexToken(ASSIGNMENT,'=',1,2392) -LexToken(NUMBER,'3',1,2393) -LexToken(EOL,'\n',1,2394) -LexToken(VAR,'model',1,2403) -LexToken(ASSIGNMENT,'=',1,2408) -LexToken(SCICOS_MODEL,'scicos_model',1,2409) -LexToken(OPENBRACKET,'(',1,2421) -LexToken(CLOSEBRACKET,')',1,2422) -LexToken(EOL,'\n',1,2423) -LexToken(VAR,'model',1,2432) -LexToken(DOT,'.',1,2437) -LexToken(VAR,'in',1,2438) -LexToken(ASSIGNMENT,'=',1,2440) -LexToken(OPENSQBRACKET,'[',1,2441) -LexToken(OPERATOR,'-',1,2442) -LexToken(OPENBRACKET,'(',1,2443) -LexToken(NUMBER,'1',1,2444) -LexToken(COLON,':',1,2445) -LexToken(VAR,'in',1,2446) -LexToken(CLOSEBRACKET,')',1,2448) -LexToken(TRANSPOSE,"'",1,2449) -LexToken(CLOSESQBRACKET,']',1,2450) -LexToken(SEMICOLON,';',1,2451) -LexToken(EOL,'\n',1,2452) -LexToken(VAR,'model',1,2461) -LexToken(DOT,'.',1,2466) -LexToken(VAR,'out',1,2467) -LexToken(ASSIGNMENT,'=',1,2470) -LexToken(OPENSQBRACKET,'[',1,2471) -LexToken(OPERATOR,'-',1,2472) -LexToken(OPENBRACKET,'(',1,2473) -LexToken(NUMBER,'1',1,2474) -LexToken(COLON,':',1,2475) -LexToken(VAR,'out',1,2476) -LexToken(CLOSEBRACKET,')',1,2479) -LexToken(TRANSPOSE,"'",1,2480) -LexToken(CLOSESQBRACKET,']',1,2481) -LexToken(SEMICOLON,';',1,2482) -LexToken(EOL,'\n',1,2483) -LexToken(VAR,'Patm',1,2492) -LexToken(ASSIGNMENT,'=',1,2496) -LexToken(NUMBER,'1.013E5',1,2497) -LexToken(EOL,'\n',1,2504) -LexToken(VAR,'A',1,2513) -LexToken(ASSIGNMENT,'=',1,2514) -LexToken(NUMBER,'1',1,2515) -LexToken(EOL,'\n',1,2516) -LexToken(VAR,'ze1',1,2525) -LexToken(ASSIGNMENT,'=',1,2528) -LexToken(NUMBER,'40',1,2529) -LexToken(EOL,'\n',1,2531) -LexToken(VAR,'ze2',1,2540) -LexToken(ASSIGNMENT,'=',1,2543) -LexToken(NUMBER,'0',1,2544) -LexToken(EOL,'\n',1,2545) -LexToken(VAR,'zs1',1,2554) -LexToken(ASSIGNMENT,'=',1,2557) -LexToken(NUMBER,'40',1,2558) -LexToken(EOL,'\n',1,2560) -LexToken(VAR,'zs2',1,2569) -LexToken(ASSIGNMENT,'=',1,2572) -LexToken(NUMBER,'0',1,2573) -LexToken(EOL,'\n',1,2574) -LexToken(VAR,'z0',1,2583) -LexToken(ASSIGNMENT,'=',1,2585) -LexToken(NUMBER,'30',1,2586) -LexToken(EOL,'\n',1,2588) -LexToken(VAR,'T0',1,2597) -LexToken(ASSIGNMENT,'=',1,2599) -LexToken(NUMBER,'290',1,2600) -LexToken(EOL,'\n',1,2603) -LexToken(VAR,'p_rho',1,2612) -LexToken(ASSIGNMENT,'=',1,2617) -LexToken(NUMBER,'0',1,2618) -LexToken(EOL,'\n',1,2619) -LexToken(VAR,'model',1,2628) -LexToken(DOT,'.',1,2633) -LexToken(VAR,'rpar',1,2634) -LexToken(ASSIGNMENT,'=',1,2638) -LexToken(OPENSQBRACKET,'[',1,2639) -LexToken(VAR,'Patm',1,2640) -LexToken(SEMICOLON,';',1,2644) -LexToken(VAR,'A',1,2645) -LexToken(SEMICOLON,';',1,2646) -LexToken(VAR,'ze1',1,2647) +LexToken(VAR,'zs2',1,2210) +LexToken(COMMA,',',1,2213) +LexToken(VAR,'z0',1,2214) +LexToken(COMMA,',',1,2216) +LexToken(VAR,'T0',1,2217) +LexToken(COMMA,',',1,2219) +LexToken(VAR,'p_rho',1,2220) +LexToken(CLOSEBRACKET,')',1,2225) +LexToken(EOL,'\n',1,2226) +LexToken(VAR,'graphics',1,2239) +LexToken(DOT,'.',1,2247) +LexToken(VAR,'exprs',1,2248) +LexToken(ASSIGNMENT,'=',1,2253) +LexToken(VAR,'exprs',1,2254) +LexToken(EOL,'\n',1,2259) +LexToken(VAR,'x',1,2272) +LexToken(DOT,'.',1,2273) +LexToken(VAR,'graphics',1,2274) +LexToken(ASSIGNMENT,'=',1,2282) +LexToken(VAR,'graphics',1,2283) +LexToken(SEMICOLON,';',1,2291) +LexToken(EOL,'\n',1,2292) +LexToken(VAR,'x',1,2305) +LexToken(DOT,'.',1,2306) +LexToken(VAR,'model',1,2307) +LexToken(ASSIGNMENT,'=',1,2312) +LexToken(VAR,'model',1,2313) +LexToken(EOL,'\n',1,2318) +LexToken(BREAK,'break',1,2331) +LexToken(EOL,'\n',1,2336) +LexToken(END,'end',1,2345) +LexToken(EOL,'\n',1,2348) +LexToken(CASE,'case',1,2353) +LexToken(DQSTRING,'"define"',1,2365) +LexToken(THEN,'then',1,2367) +LexToken(EOL,'\n',1,2371) +LexToken(VAR,'in',1,2380) +LexToken(ASSIGNMENT,'=',1,2382) +LexToken(NUMBER,'2',1,2383) +LexToken(EOL,'\n',1,2384) +LexToken(VAR,'out',1,2393) +LexToken(ASSIGNMENT,'=',1,2396) +LexToken(NUMBER,'3',1,2397) +LexToken(EOL,'\n',1,2398) +LexToken(VAR,'model',1,2407) +LexToken(ASSIGNMENT,'=',1,2412) +LexToken(SCICOS_MODEL,'scicos_model',1,2413) +LexToken(OPENBRACKET,'(',1,2425) +LexToken(CLOSEBRACKET,')',1,2426) +LexToken(EOL,'\n',1,2427) +LexToken(VAR,'model',1,2436) +LexToken(DOT,'.',1,2441) +LexToken(VAR,'in',1,2442) +LexToken(ASSIGNMENT,'=',1,2444) +LexToken(OPENSQBRACKET,'[',1,2445) +LexToken(ADDITION,'-',1,2446) +LexToken(OPENBRACKET,'(',1,2447) +LexToken(NUMBER,'1',1,2448) +LexToken(COLON,':',1,2449) +LexToken(VAR,'in',1,2450) +LexToken(CLOSEBRACKET,')',1,2452) +LexToken(TRANSPOSE,"'",1,2453) +LexToken(CLOSESQBRACKET,']',1,2454) +LexToken(SEMICOLON,';',1,2455) +LexToken(EOL,'\n',1,2456) +LexToken(VAR,'model',1,2465) +LexToken(DOT,'.',1,2470) +LexToken(VAR,'out',1,2471) +LexToken(ASSIGNMENT,'=',1,2474) +LexToken(OPENSQBRACKET,'[',1,2475) +LexToken(ADDITION,'-',1,2476) +LexToken(OPENBRACKET,'(',1,2477) +LexToken(NUMBER,'1',1,2478) +LexToken(COLON,':',1,2479) +LexToken(VAR,'out',1,2480) +LexToken(CLOSEBRACKET,')',1,2483) +LexToken(TRANSPOSE,"'",1,2484) +LexToken(CLOSESQBRACKET,']',1,2485) +LexToken(SEMICOLON,';',1,2486) +LexToken(EOL,'\n',1,2487) +LexToken(VAR,'Patm',1,2496) +LexToken(ASSIGNMENT,'=',1,2500) +LexToken(NUMBER,'1.013E5',1,2501) +LexToken(EOL,'\n',1,2508) +LexToken(VAR,'A',1,2517) +LexToken(ASSIGNMENT,'=',1,2518) +LexToken(NUMBER,'1',1,2519) +LexToken(EOL,'\n',1,2520) +LexToken(VAR,'ze1',1,2529) +LexToken(ASSIGNMENT,'=',1,2532) +LexToken(NUMBER,'40',1,2533) +LexToken(EOL,'\n',1,2535) +LexToken(VAR,'ze2',1,2544) +LexToken(ASSIGNMENT,'=',1,2547) +LexToken(NUMBER,'0',1,2548) +LexToken(EOL,'\n',1,2549) +LexToken(VAR,'zs1',1,2558) +LexToken(ASSIGNMENT,'=',1,2561) +LexToken(NUMBER,'40',1,2562) +LexToken(EOL,'\n',1,2564) +LexToken(VAR,'zs2',1,2573) +LexToken(ASSIGNMENT,'=',1,2576) +LexToken(NUMBER,'0',1,2577) +LexToken(EOL,'\n',1,2578) +LexToken(VAR,'z0',1,2587) +LexToken(ASSIGNMENT,'=',1,2589) +LexToken(NUMBER,'30',1,2590) +LexToken(EOL,'\n',1,2592) +LexToken(VAR,'T0',1,2601) +LexToken(ASSIGNMENT,'=',1,2603) +LexToken(NUMBER,'290',1,2604) +LexToken(EOL,'\n',1,2607) +LexToken(VAR,'p_rho',1,2616) +LexToken(ASSIGNMENT,'=',1,2621) +LexToken(NUMBER,'0',1,2622) +LexToken(EOL,'\n',1,2623) +LexToken(VAR,'model',1,2632) +LexToken(DOT,'.',1,2637) +LexToken(VAR,'rpar',1,2638) +LexToken(ASSIGNMENT,'=',1,2642) +LexToken(OPENSQBRACKET,'[',1,2643) +LexToken(VAR,'Patm',1,2644) +LexToken(SEMICOLON,';',1,2648) +LexToken(VAR,'A',1,2649) LexToken(SEMICOLON,';',1,2650) -LexToken(VAR,'ze2',1,2651) +LexToken(VAR,'ze1',1,2651) LexToken(SEMICOLON,';',1,2654) -LexToken(VAR,'zs1',1,2655) +LexToken(VAR,'ze2',1,2655) LexToken(SEMICOLON,';',1,2658) -LexToken(VAR,'zs2',1,2659) +LexToken(VAR,'zs1',1,2659) LexToken(SEMICOLON,';',1,2662) -LexToken(VAR,'z0',1,2663) -LexToken(SEMICOLON,';',1,2665) -LexToken(VAR,'T0',1,2666) -LexToken(SEMICOLON,';',1,2668) -LexToken(VAR,'p_rho',1,2669) -LexToken(CLOSESQBRACKET,']',1,2674) -LexToken(EOL,'\n',1,2675) -LexToken(VAR,'model',1,2684) -LexToken(DOT,'.',1,2689) -LexToken(VAR,'sim',1,2690) -LexToken(ASSIGNMENT,'=',1,2693) -LexToken(DQSTRING,'"Bache"',1,2700) -LexToken(EOL,'\n',1,2701) -LexToken(VAR,'model',1,2710) -LexToken(DOT,'.',1,2715) -LexToken(VAR,'blocktype',1,2716) -LexToken(ASSIGNMENT,'=',1,2725) -LexToken(DQSTRING,'"c"',1,2728) -LexToken(EOL,'\n',1,2729) -LexToken(VAR,'model',1,2738) -LexToken(DOT,'.',1,2743) -LexToken(VAR,'dep_ut',1,2744) -LexToken(ASSIGNMENT,'=',1,2750) -LexToken(OPENSQBRACKET,'[',1,2751) -LexToken(PREVAR_BOOLEAN,'%t',1,2752) -LexToken(PREVAR_BOOLEAN,'%f',1,2755) -LexToken(CLOSESQBRACKET,']',1,2757) -LexToken(EOL,'\n',1,2758) -LexToken(EOL,'\n',1,2759) -LexToken(VAR,'mo',1,2768) -LexToken(ASSIGNMENT,'=',1,2770) -LexToken(VAR,'modelica',1,2771) -LexToken(OPENBRACKET,'(',1,2779) -LexToken(CLOSEBRACKET,')',1,2780) -LexToken(EOL,'\n',1,2781) -LexToken(VAR,'mo',1,2790) -LexToken(DOT,'.',1,2792) -LexToken(VAR,'model',1,2793) -LexToken(ASSIGNMENT,'=',1,2798) -LexToken(DQSTRING,'"Bache"',1,2805) -LexToken(EOL,'\n',1,2806) -LexToken(VAR,'mo',1,2815) -LexToken(DOT,'.',1,2817) -LexToken(VAR,'inputs',1,2818) -LexToken(ASSIGNMENT,'=',1,2824) -LexToken(OPENSQBRACKET,'[',1,2825) -LexToken(DQSTRING,'"Ce1"',1,2830) -LexToken(DQSTRING,'"Ce2"',1,2836) -LexToken(CLOSESQBRACKET,']',1,2837) -LexToken(SEMICOLON,';',1,2838) -LexToken(EOL,'\n',1,2839) -LexToken(VAR,'mo',1,2848) -LexToken(DOT,'.',1,2850) -LexToken(VAR,'outputs',1,2851) -LexToken(ASSIGNMENT,'=',1,2858) -LexToken(OPENSQBRACKET,'[',1,2859) -LexToken(DQSTRING,'"Cs1"',1,2864) -LexToken(DQSTRING,'"Cs2"',1,2870) -LexToken(DQSTRING,'"yNiveau"',1,2880) -LexToken(CLOSESQBRACKET,']',1,2881) -LexToken(SEMICOLON,';',1,2882) -LexToken(EOL,'\n',1,2883) -LexToken(VAR,'mo',1,2892) -LexToken(DOT,'.',1,2894) -LexToken(VAR,'parameters',1,2895) -LexToken(ASSIGNMENT,'=',1,2905) -LexToken(VAR,'list',1,2906) -LexToken(OPENBRACKET,'(',1,2910) -LexToken(OPENSQBRACKET,'[',1,2911) -LexToken(DQSTRING,'"Patm"',1,2917) -LexToken(SEMICOLON,';',1,2918) -LexToken(DQSTRING,'"A"',1,2921) +LexToken(VAR,'zs2',1,2663) +LexToken(SEMICOLON,';',1,2666) +LexToken(VAR,'z0',1,2667) +LexToken(SEMICOLON,';',1,2669) +LexToken(VAR,'T0',1,2670) +LexToken(SEMICOLON,';',1,2672) +LexToken(VAR,'p_rho',1,2673) +LexToken(CLOSESQBRACKET,']',1,2678) +LexToken(EOL,'\n',1,2679) +LexToken(VAR,'model',1,2688) +LexToken(DOT,'.',1,2693) +LexToken(VAR,'sim',1,2694) +LexToken(ASSIGNMENT,'=',1,2697) +LexToken(DQSTRING,'"Bache"',1,2704) +LexToken(EOL,'\n',1,2705) +LexToken(VAR,'model',1,2714) +LexToken(DOT,'.',1,2719) +LexToken(VAR,'blocktype',1,2720) +LexToken(ASSIGNMENT,'=',1,2729) +LexToken(DQSTRING,'"c"',1,2732) +LexToken(EOL,'\n',1,2733) +LexToken(VAR,'model',1,2742) +LexToken(DOT,'.',1,2747) +LexToken(VAR,'dep_ut',1,2748) +LexToken(ASSIGNMENT,'=',1,2754) +LexToken(OPENSQBRACKET,'[',1,2755) +LexToken(PREVAR_BOOLEAN,'%t',1,2756) +LexToken(PREVAR_BOOLEAN,'%f',1,2759) +LexToken(CLOSESQBRACKET,']',1,2761) +LexToken(EOL,'\n',1,2762) +LexToken(EOL,'\n',1,2763) +LexToken(VAR,'mo',1,2772) +LexToken(ASSIGNMENT,'=',1,2774) +LexToken(VAR,'modelica',1,2775) +LexToken(OPENBRACKET,'(',1,2783) +LexToken(CLOSEBRACKET,')',1,2784) +LexToken(EOL,'\n',1,2785) +LexToken(VAR,'mo',1,2794) +LexToken(DOT,'.',1,2796) +LexToken(VAR,'model',1,2797) +LexToken(ASSIGNMENT,'=',1,2802) +LexToken(DQSTRING,'"Bache"',1,2809) +LexToken(EOL,'\n',1,2810) +LexToken(VAR,'mo',1,2819) +LexToken(DOT,'.',1,2821) +LexToken(VAR,'inputs',1,2822) +LexToken(ASSIGNMENT,'=',1,2828) +LexToken(OPENSQBRACKET,'[',1,2829) +LexToken(DQSTRING,'"Ce1"',1,2834) +LexToken(DQSTRING,'"Ce2"',1,2840) +LexToken(CLOSESQBRACKET,']',1,2841) +LexToken(SEMICOLON,';',1,2842) +LexToken(EOL,'\n',1,2843) +LexToken(VAR,'mo',1,2852) +LexToken(DOT,'.',1,2854) +LexToken(VAR,'outputs',1,2855) +LexToken(ASSIGNMENT,'=',1,2862) +LexToken(OPENSQBRACKET,'[',1,2863) +LexToken(DQSTRING,'"Cs1"',1,2868) +LexToken(DQSTRING,'"Cs2"',1,2874) +LexToken(DQSTRING,'"yNiveau"',1,2884) +LexToken(CLOSESQBRACKET,']',1,2885) +LexToken(SEMICOLON,';',1,2886) +LexToken(EOL,'\n',1,2887) +LexToken(VAR,'mo',1,2896) +LexToken(DOT,'.',1,2898) +LexToken(VAR,'parameters',1,2899) +LexToken(ASSIGNMENT,'=',1,2909) +LexToken(VAR,'list',1,2910) +LexToken(OPENBRACKET,'(',1,2914) +LexToken(OPENSQBRACKET,'[',1,2915) +LexToken(DQSTRING,'"Patm"',1,2921) LexToken(SEMICOLON,';',1,2922) -LexToken(DQSTRING,'"ze1"',1,2927) -LexToken(SEMICOLON,';',1,2928) -LexToken(DQSTRING,'"ze2"',1,2933) -LexToken(SEMICOLON,';',1,2934) -LexToken(DQSTRING,'"zs1"',1,2939) -LexToken(SEMICOLON,';',1,2940) -LexToken(DQSTRING,'"zs2"',1,2945) -LexToken(SEMICOLON,';',1,2946) -LexToken(DQSTRING,'"z0"',1,2950) -LexToken(SEMICOLON,';',1,2951) -LexToken(DQSTRING,'"T0"',1,2955) -LexToken(SEMICOLON,';',1,2956) -LexToken(DQSTRING,'"p_rho"',1,2963) -LexToken(CLOSESQBRACKET,']',1,2964) -LexToken(COMMA,',',1,2965) -LexToken(OPENSQBRACKET,'[',1,2966) -LexToken(VAR,'Patm',1,2967) -LexToken(SEMICOLON,';',1,2971) -LexToken(VAR,'A',1,2972) -LexToken(SEMICOLON,';',1,2973) -LexToken(VAR,'ze1',1,2974) +LexToken(DQSTRING,'"A"',1,2925) +LexToken(SEMICOLON,';',1,2926) +LexToken(DQSTRING,'"ze1"',1,2931) +LexToken(SEMICOLON,';',1,2932) +LexToken(DQSTRING,'"ze2"',1,2937) +LexToken(SEMICOLON,';',1,2938) +LexToken(DQSTRING,'"zs1"',1,2943) +LexToken(SEMICOLON,';',1,2944) +LexToken(DQSTRING,'"zs2"',1,2949) +LexToken(SEMICOLON,';',1,2950) +LexToken(DQSTRING,'"z0"',1,2954) +LexToken(SEMICOLON,';',1,2955) +LexToken(DQSTRING,'"T0"',1,2959) +LexToken(SEMICOLON,';',1,2960) +LexToken(DQSTRING,'"p_rho"',1,2967) +LexToken(CLOSESQBRACKET,']',1,2968) +LexToken(COMMA,',',1,2969) +LexToken(OPENSQBRACKET,'[',1,2970) +LexToken(VAR,'Patm',1,2971) +LexToken(SEMICOLON,';',1,2975) +LexToken(VAR,'A',1,2976) LexToken(SEMICOLON,';',1,2977) -LexToken(VAR,'ze2',1,2978) +LexToken(VAR,'ze1',1,2978) LexToken(SEMICOLON,';',1,2981) -LexToken(VAR,'zs1',1,2982) +LexToken(VAR,'ze2',1,2982) LexToken(SEMICOLON,';',1,2985) -LexToken(VAR,'zs2',1,2986) +LexToken(VAR,'zs1',1,2986) LexToken(SEMICOLON,';',1,2989) -LexToken(VAR,'z0',1,2990) -LexToken(SEMICOLON,';',1,2992) -LexToken(VAR,'T0',1,2993) -LexToken(SEMICOLON,';',1,2995) -LexToken(VAR,'p_rho',1,2996) -LexToken(CLOSESQBRACKET,']',1,3001) -LexToken(CLOSEBRACKET,')',1,3002) -LexToken(EOL,'\n',1,3003) -LexToken(VAR,'model',1,3012) -LexToken(DOT,'.',1,3017) -LexToken(VAR,'equations',1,3018) -LexToken(ASSIGNMENT,'=',1,3027) -LexToken(VAR,'mo',1,3028) -LexToken(EOL,'\n',1,3030) -LexToken(VAR,'model',1,3039) -LexToken(DOT,'.',1,3044) -LexToken(VAR,'in',1,3045) -LexToken(ASSIGNMENT,'=',1,3047) -LexToken(VAR,'ones',1,3048) -LexToken(OPENBRACKET,'(',1,3052) -LexToken(VAR,'size',1,3053) -LexToken(OPENBRACKET,'(',1,3057) -LexToken(VAR,'mo',1,3058) -LexToken(DOT,'.',1,3060) -LexToken(VAR,'inputs',1,3061) -LexToken(COMMA,',',1,3067) -LexToken(DQSTRING,'"*"',1,3070) -LexToken(CLOSEBRACKET,')',1,3071) -LexToken(COMMA,',',1,3072) -LexToken(NUMBER,'1',1,3073) -LexToken(CLOSEBRACKET,')',1,3074) -LexToken(EOL,'\n',1,3075) -LexToken(VAR,'model',1,3084) -LexToken(DOT,'.',1,3089) -LexToken(VAR,'out',1,3090) -LexToken(ASSIGNMENT,'=',1,3093) -LexToken(VAR,'ones',1,3094) -LexToken(OPENBRACKET,'(',1,3098) -LexToken(VAR,'size',1,3099) -LexToken(OPENBRACKET,'(',1,3103) -LexToken(VAR,'mo',1,3104) -LexToken(DOT,'.',1,3106) -LexToken(VAR,'outputs',1,3107) -LexToken(COMMA,',',1,3114) -LexToken(DQSTRING,'"*"',1,3117) -LexToken(CLOSEBRACKET,')',1,3118) -LexToken(COMMA,',',1,3119) -LexToken(NUMBER,'1',1,3120) -LexToken(CLOSEBRACKET,')',1,3121) -LexToken(EOL,'\n',1,3122) -LexToken(VAR,'exprs',1,3131) -LexToken(ASSIGNMENT,'=',1,3136) -LexToken(OPENSQBRACKET,'[',1,3137) -LexToken(VAR,'string',1,3138) -LexToken(OPENBRACKET,'(',1,3144) -LexToken(VAR,'Patm',1,3145) -LexToken(CLOSEBRACKET,')',1,3149) -LexToken(SEMICOLON,';',1,3150) -LexToken(VAR,'string',1,3151) -LexToken(OPENBRACKET,'(',1,3157) -LexToken(VAR,'A',1,3158) -LexToken(CLOSEBRACKET,')',1,3159) -LexToken(SEMICOLON,';',1,3160) -LexToken(VAR,'string',1,3161) -LexToken(OPENBRACKET,'(',1,3167) -LexToken(VAR,'ze1',1,3168) -LexToken(CLOSEBRACKET,')',1,3171) -LexToken(SEMICOLON,';',1,3172) -LexToken(VAR,'string',1,3173) -LexToken(OPENBRACKET,'(',1,3179) -LexToken(VAR,'ze2',1,3180) -LexToken(CLOSEBRACKET,')',1,3183) -LexToken(SEMICOLON,';',1,3184) -LexToken(VAR,'string',1,3185) -LexToken(OPENBRACKET,'(',1,3191) -LexToken(VAR,'zs1',1,3192) -LexToken(CLOSEBRACKET,')',1,3195) -LexToken(SEMICOLON,';',1,3196) -LexToken(VAR,'string',1,3197) -LexToken(OPENBRACKET,'(',1,3203) -LexToken(VAR,'zs2',1,3204) -LexToken(CLOSEBRACKET,')',1,3207) -LexToken(SEMICOLON,';',1,3208) -LexToken(VAR,'string',1,3209) -LexToken(OPENBRACKET,'(',1,3215) -LexToken(VAR,'z0',1,3216) -LexToken(CLOSEBRACKET,')',1,3218) -LexToken(SEMICOLON,';',1,3219) -LexToken(VAR,'string',1,3220) -LexToken(OPENBRACKET,'(',1,3226) -LexToken(VAR,'T0',1,3227) -LexToken(CLOSEBRACKET,')',1,3229) -LexToken(SEMICOLON,';',1,3230) -LexToken(VAR,'string',1,3231) -LexToken(OPENBRACKET,'(',1,3237) -LexToken(VAR,'p_rho',1,3238) -LexToken(CLOSEBRACKET,')',1,3243) -LexToken(CLOSESQBRACKET,']',1,3244) -LexToken(EOL,'\n',1,3245) -LexToken(VAR,'gr_i',1,3254) -LexToken(ASSIGNMENT,'=',1,3258) -LexToken(OPENSQBRACKET,'[',1,3259) -LexToken(CLOSESQBRACKET,']',1,3260) -LexToken(SEMICOLON,';',1,3261) -LexToken(EOL,'\n',1,3262) -LexToken(EOL,'\n',1,3373) -LexToken(VAR,'x',1,3382) -LexToken(ASSIGNMENT,'=',1,3383) -LexToken(VAR,'standard_define',1,3384) -LexToken(OPENBRACKET,'(',1,3399) -LexToken(OPENSQBRACKET,'[',1,3400) -LexToken(NUMBER,'2',1,3401) -LexToken(NUMBER,'2',1,3403) -LexToken(CLOSESQBRACKET,']',1,3404) -LexToken(COMMA,',',1,3405) -LexToken(VAR,'model',1,3406) -LexToken(COMMA,',',1,3411) -LexToken(VAR,'exprs',1,3412) -LexToken(COMMA,',',1,3417) -LexToken(VAR,'list',1,3418) -LexToken(OPENBRACKET,'(',1,3422) -LexToken(VAR,'gr_i',1,3423) -LexToken(COMMA,',',1,3427) -LexToken(NUMBER,'0',1,3428) -LexToken(CLOSEBRACKET,')',1,3429) -LexToken(CLOSEBRACKET,')',1,3430) -LexToken(EOL,'\n',1,3431) -LexToken(VAR,'x',1,3440) -LexToken(DOT,'.',1,3441) -LexToken(VAR,'graphics',1,3442) -LexToken(DOT,'.',1,3450) -LexToken(VAR,'in_implicit',1,3451) -LexToken(ASSIGNMENT,'=',1,3462) -LexToken(OPENSQBRACKET,'[',1,3463) -LexToken(DQSTRING,'"I"',1,3466) -LexToken(SEMICOLON,';',1,3467) +LexToken(VAR,'zs2',1,2990) +LexToken(SEMICOLON,';',1,2993) +LexToken(VAR,'z0',1,2994) +LexToken(SEMICOLON,';',1,2996) +LexToken(VAR,'T0',1,2997) +LexToken(SEMICOLON,';',1,2999) +LexToken(VAR,'p_rho',1,3000) +LexToken(CLOSESQBRACKET,']',1,3005) +LexToken(CLOSEBRACKET,')',1,3006) +LexToken(EOL,'\n',1,3007) +LexToken(VAR,'model',1,3016) +LexToken(DOT,'.',1,3021) +LexToken(VAR,'equations',1,3022) +LexToken(ASSIGNMENT,'=',1,3031) +LexToken(VAR,'mo',1,3032) +LexToken(EOL,'\n',1,3034) +LexToken(VAR,'model',1,3043) +LexToken(DOT,'.',1,3048) +LexToken(VAR,'in',1,3049) +LexToken(ASSIGNMENT,'=',1,3051) +LexToken(VAR,'ones',1,3052) +LexToken(OPENBRACKET,'(',1,3056) +LexToken(VAR,'size',1,3057) +LexToken(OPENBRACKET,'(',1,3061) +LexToken(VAR,'mo',1,3062) +LexToken(DOT,'.',1,3064) +LexToken(VAR,'inputs',1,3065) +LexToken(COMMA,',',1,3071) +LexToken(DQSTRING,'"*"',1,3074) +LexToken(CLOSEBRACKET,')',1,3075) +LexToken(COMMA,',',1,3076) +LexToken(NUMBER,'1',1,3077) +LexToken(CLOSEBRACKET,')',1,3078) +LexToken(EOL,'\n',1,3079) +LexToken(VAR,'model',1,3088) +LexToken(DOT,'.',1,3093) +LexToken(VAR,'out',1,3094) +LexToken(ASSIGNMENT,'=',1,3097) +LexToken(VAR,'ones',1,3098) +LexToken(OPENBRACKET,'(',1,3102) +LexToken(VAR,'size',1,3103) +LexToken(OPENBRACKET,'(',1,3107) +LexToken(VAR,'mo',1,3108) +LexToken(DOT,'.',1,3110) +LexToken(VAR,'outputs',1,3111) +LexToken(COMMA,',',1,3118) +LexToken(DQSTRING,'"*"',1,3121) +LexToken(CLOSEBRACKET,')',1,3122) +LexToken(COMMA,',',1,3123) +LexToken(NUMBER,'1',1,3124) +LexToken(CLOSEBRACKET,')',1,3125) +LexToken(EOL,'\n',1,3126) +LexToken(VAR,'exprs',1,3135) +LexToken(ASSIGNMENT,'=',1,3140) +LexToken(OPENSQBRACKET,'[',1,3141) +LexToken(VAR,'string',1,3142) +LexToken(OPENBRACKET,'(',1,3148) +LexToken(VAR,'Patm',1,3149) +LexToken(CLOSEBRACKET,')',1,3153) +LexToken(SEMICOLON,';',1,3154) +LexToken(VAR,'string',1,3155) +LexToken(OPENBRACKET,'(',1,3161) +LexToken(VAR,'A',1,3162) +LexToken(CLOSEBRACKET,')',1,3163) +LexToken(SEMICOLON,';',1,3164) +LexToken(VAR,'string',1,3165) +LexToken(OPENBRACKET,'(',1,3171) +LexToken(VAR,'ze1',1,3172) +LexToken(CLOSEBRACKET,')',1,3175) +LexToken(SEMICOLON,';',1,3176) +LexToken(VAR,'string',1,3177) +LexToken(OPENBRACKET,'(',1,3183) +LexToken(VAR,'ze2',1,3184) +LexToken(CLOSEBRACKET,')',1,3187) +LexToken(SEMICOLON,';',1,3188) +LexToken(VAR,'string',1,3189) +LexToken(OPENBRACKET,'(',1,3195) +LexToken(VAR,'zs1',1,3196) +LexToken(CLOSEBRACKET,')',1,3199) +LexToken(SEMICOLON,';',1,3200) +LexToken(VAR,'string',1,3201) +LexToken(OPENBRACKET,'(',1,3207) +LexToken(VAR,'zs2',1,3208) +LexToken(CLOSEBRACKET,')',1,3211) +LexToken(SEMICOLON,';',1,3212) +LexToken(VAR,'string',1,3213) +LexToken(OPENBRACKET,'(',1,3219) +LexToken(VAR,'z0',1,3220) +LexToken(CLOSEBRACKET,')',1,3222) +LexToken(SEMICOLON,';',1,3223) +LexToken(VAR,'string',1,3224) +LexToken(OPENBRACKET,'(',1,3230) +LexToken(VAR,'T0',1,3231) +LexToken(CLOSEBRACKET,')',1,3233) +LexToken(SEMICOLON,';',1,3234) +LexToken(VAR,'string',1,3235) +LexToken(OPENBRACKET,'(',1,3241) +LexToken(VAR,'p_rho',1,3242) +LexToken(CLOSEBRACKET,')',1,3247) +LexToken(CLOSESQBRACKET,']',1,3248) +LexToken(EOL,'\n',1,3249) +LexToken(VAR,'gr_i',1,3258) +LexToken(ASSIGNMENT,'=',1,3262) +LexToken(OPENSQBRACKET,'[',1,3263) +LexToken(CLOSESQBRACKET,']',1,3264) +LexToken(SEMICOLON,';',1,3265) +LexToken(EOL,'\n',1,3266) +LexToken(EOL,'\n',1,3377) +LexToken(VAR,'x',1,3386) +LexToken(ASSIGNMENT,'=',1,3387) +LexToken(VAR,'standard_define',1,3388) +LexToken(OPENBRACKET,'(',1,3403) +LexToken(OPENSQBRACKET,'[',1,3404) +LexToken(NUMBER,'2',1,3405) +LexToken(NUMBER,'2',1,3407) +LexToken(CLOSESQBRACKET,']',1,3408) +LexToken(COMMA,',',1,3409) +LexToken(VAR,'model',1,3410) +LexToken(COMMA,',',1,3415) +LexToken(VAR,'exprs',1,3416) +LexToken(COMMA,',',1,3421) +LexToken(VAR,'list',1,3422) +LexToken(OPENBRACKET,'(',1,3426) +LexToken(VAR,'gr_i',1,3427) +LexToken(COMMA,',',1,3431) +LexToken(NUMBER,'0',1,3432) +LexToken(CLOSEBRACKET,')',1,3433) +LexToken(CLOSEBRACKET,')',1,3434) +LexToken(EOL,'\n',1,3435) +LexToken(VAR,'x',1,3444) +LexToken(DOT,'.',1,3445) +LexToken(VAR,'graphics',1,3446) +LexToken(DOT,'.',1,3454) +LexToken(VAR,'in_implicit',1,3455) +LexToken(ASSIGNMENT,'=',1,3466) +LexToken(OPENSQBRACKET,'[',1,3467) LexToken(DQSTRING,'"I"',1,3470) -LexToken(CLOSESQBRACKET,']',1,3471) -LexToken(EOL,'\n',1,3472) -LexToken(VAR,'x',1,3481) -LexToken(DOT,'.',1,3482) -LexToken(VAR,'graphics',1,3483) -LexToken(DOT,'.',1,3491) -LexToken(VAR,'out_implicit',1,3492) -LexToken(ASSIGNMENT,'=',1,3504) -LexToken(OPENSQBRACKET,'[',1,3505) -LexToken(DQSTRING,'"I"',1,3508) -LexToken(SEMICOLON,';',1,3509) +LexToken(SEMICOLON,';',1,3471) +LexToken(DQSTRING,'"I"',1,3474) +LexToken(CLOSESQBRACKET,']',1,3475) +LexToken(EOL,'\n',1,3476) +LexToken(VAR,'x',1,3485) +LexToken(DOT,'.',1,3486) +LexToken(VAR,'graphics',1,3487) +LexToken(DOT,'.',1,3495) +LexToken(VAR,'out_implicit',1,3496) +LexToken(ASSIGNMENT,'=',1,3508) +LexToken(OPENSQBRACKET,'[',1,3509) LexToken(DQSTRING,'"I"',1,3512) LexToken(SEMICOLON,';',1,3513) -LexToken(DQSTRING,'"E"',1,3516) -LexToken(CLOSESQBRACKET,']',1,3517) -LexToken(EOL,'\n',1,3518) -LexToken(END,'end',1,3523) -LexToken(EOL,'\n',1,3526) -LexToken(ENDFUNCTION,'endfunction',1,3527) -LexToken(EOL,'\n',1,3538) +LexToken(DQSTRING,'"I"',1,3516) +LexToken(SEMICOLON,';',1,3517) +LexToken(DQSTRING,'"E"',1,3520) +LexToken(CLOSESQBRACKET,']',1,3521) +LexToken(EOL,'\n',1,3522) +LexToken(END,'end',1,3527) +LexToken(EOL,'\n',1,3530) +LexToken(ENDFUNCTION,'endfunction',1,3531) +LexToken(EOL,'\n',1,3542) diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index b912b589..a9b42911 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -225,7 +225,8 @@ LexToken(NUMBER,'50',1,1787) LexToken(COMMA,',',1,1789) LexToken(NUMBER,'105',1,1790) LexToken(COMMA,',',1,1793) -LexToken(NUMBER,'-1',1,1794) +LexToken(ADDITION,'-',1,1794) +LexToken(NUMBER,'1',1,1795) LexToken(COMMA,',',1,1796) LexToken(NUMBER,'90',1,1797) LexToken(SEMICOLON,';',1,1799) @@ -241,7 +242,8 @@ LexToken(NUMBER,'101',1,1809) LexToken(COMMA,',',1,1812) LexToken(NUMBER,'10',1,1813) LexToken(COMMA,',',1,1815) -LexToken(NUMBER,'-2',1,1816) +LexToken(ADDITION,'-',1,1816) +LexToken(NUMBER,'2',1,1817) LexToken(COMMA,',',1,1818) LexToken(NUMBER,'0',1,1819) LexToken(CLOSESQBRACKET,']',1,1820) @@ -344,7 +346,8 @@ LexToken(COMMA,',',1,2152) LexToken(NUMBER,'3',1,2153) LexToken(CLOSEBRACKET,')',1,2154) LexToken(COMPARISON,'==',1,2155) -LexToken(NUMBER,'-1',1,2157) +LexToken(ADDITION,'-',1,2157) +LexToken(NUMBER,'1',1,2158) LexToken(THEN,'then',1,2160) LexToken(EOL,'\n',1,2164) LexToken(VAR,'Typeout',1,2181) @@ -378,7 +381,8 @@ LexToken(COMMA,',',1,2275) LexToken(NUMBER,'3',1,2276) LexToken(CLOSEBRACKET,')',1,2277) LexToken(COMPARISON,'==',1,2278) -LexToken(NUMBER,'-2',1,2280) +LexToken(ADDITION,'-',1,2280) +LexToken(NUMBER,'2',1,2281) LexToken(THEN,'then',1,2283) LexToken(EOL,'\n',1,2287) LexToken(VAR,'Typeout',1,2304) diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 301ac491..3927b110 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -121,398 +121,404 @@ LexToken(COMMA,',',1,1365) LexToken(OPENSQBRACKET,'[',1,1382) LexToken(DQSTRING,'"Longueur du tube : L (m)"',1,1408) LexToken(SEMICOLON,';',1,1409) -LexToken(DQSTRING,'"Diamètre interne du tube : D (m)"',1,1458) -LexToken(SEMICOLON,';',1,1459) -LexToken(DQSTRING,'"Coefficient de perte de charge-frottement(S.U) : lambda"',1,1531) -LexToken(SEMICOLON,';',1,1532) -LexToken(DQSTRING,'"Altitude entrée tuyauterie : z1 (m)"',1,1584) -LexToken(SEMICOLON,';',1,1585) -LexToken(DQSTRING,'"Altitude sortie tuyauterie : z2 (m)"',1,1637) -LexToken(SEMICOLON,';',1,1638) -LexToken(DQSTRING,'"Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"',1,1711) -LexToken(CLOSESQBRACKET,']',1,1712) -LexToken(COMMA,',',1,1713) -LexToken(VAR,'list',1,1729) -LexToken(OPENBRACKET,'(',1,1733) -LexToken(DQSTRING,'"vec"',1,1738) -LexToken(COMMA,',',1,1739) -LexToken(NUMBER,'-1',1,1740) +LexToken(DQSTRING,'"Diam\xc3\xa8tre interne du tube : D (m)"',1,1459) +LexToken(SEMICOLON,';',1,1460) +LexToken(DQSTRING,'"Coefficient de perte de charge-frottement(S.U) : lambda"',1,1532) +LexToken(SEMICOLON,';',1,1533) +LexToken(DQSTRING,'"Altitude entr\xc3\xa9e tuyauterie : z1 (m)"',1,1586) +LexToken(SEMICOLON,';',1,1587) +LexToken(DQSTRING,'"Altitude sortie tuyauterie : z2 (m)"',1,1639) +LexToken(SEMICOLON,';',1,1640) +LexToken(DQSTRING,'"Si >0, masse volumique impos\xc3\xa9e fu fluide : p_rho (kg/m3)"',1,1714) +LexToken(CLOSESQBRACKET,']',1,1715) +LexToken(COMMA,',',1,1716) +LexToken(VAR,'list',1,1732) +LexToken(OPENBRACKET,'(',1,1736) +LexToken(DQSTRING,'"vec"',1,1741) LexToken(COMMA,',',1,1742) -LexToken(DQSTRING,'"vec"',1,1747) -LexToken(COMMA,',',1,1748) -LexToken(NUMBER,'-1',1,1749) +LexToken(ADDITION,'-',1,1743) +LexToken(NUMBER,'1',1,1744) +LexToken(COMMA,',',1,1745) +LexToken(DQSTRING,'"vec"',1,1750) LexToken(COMMA,',',1,1751) -LexToken(DQSTRING,'"vec"',1,1756) -LexToken(COMMA,',',1,1757) -LexToken(NUMBER,'-1',1,1758) +LexToken(ADDITION,'-',1,1752) +LexToken(NUMBER,'1',1,1753) +LexToken(COMMA,',',1,1754) +LexToken(DQSTRING,'"vec"',1,1759) LexToken(COMMA,',',1,1760) -LexToken(DQSTRING,'"vec"',1,1765) -LexToken(COMMA,',',1,1766) -LexToken(NUMBER,'-1',1,1767) +LexToken(ADDITION,'-',1,1761) +LexToken(NUMBER,'1',1,1762) +LexToken(COMMA,',',1,1763) +LexToken(DQSTRING,'"vec"',1,1768) LexToken(COMMA,',',1,1769) -LexToken(DQSTRING,'"vec"',1,1774) -LexToken(COMMA,',',1,1775) -LexToken(NUMBER,'-1',1,1776) +LexToken(ADDITION,'-',1,1770) +LexToken(NUMBER,'1',1,1771) +LexToken(COMMA,',',1,1772) +LexToken(DQSTRING,'"vec"',1,1777) LexToken(COMMA,',',1,1778) -LexToken(DQSTRING,'"vec"',1,1783) -LexToken(COMMA,',',1,1784) -LexToken(NUMBER,'-1',1,1785) -LexToken(CLOSEBRACKET,')',1,1787) -LexToken(COMMA,',',1,1788) -LexToken(VAR,'exprs',1,1789) -LexToken(CLOSEBRACKET,')',1,1794) -LexToken(EOL,'\n',1,1795) -LexToken(IF,'if',1,1808) -LexToken(NOT,'~',1,1811) -LexToken(VAR,'ok',1,1812) -LexToken(THEN,'then',1,1815) -LexToken(EOL,'\n',1,1819) -LexToken(BREAK,'break',1,1836) -LexToken(COMMA,',',1,1841) -LexToken(EOL,'\n',1,1842) -LexToken(END,'end',1,1855) -LexToken(EOL,'\n',1,1858) -LexToken(VAR,'model',1,1871) -LexToken(DOT,'.',1,1876) -LexToken(VAR,'rpar',1,1877) -LexToken(ASSIGNMENT,'=',1,1881) -LexToken(OPENSQBRACKET,'[',1,1882) -LexToken(VAR,'L',1,1883) -LexToken(SEMICOLON,';',1,1884) -LexToken(VAR,'D',1,1885) -LexToken(SEMICOLON,';',1,1886) -LexToken(VAR,'lambda',1,1887) -LexToken(SEMICOLON,';',1,1893) -LexToken(VAR,'z1',1,1894) +LexToken(ADDITION,'-',1,1779) +LexToken(NUMBER,'1',1,1780) +LexToken(COMMA,',',1,1781) +LexToken(DQSTRING,'"vec"',1,1786) +LexToken(COMMA,',',1,1787) +LexToken(ADDITION,'-',1,1788) +LexToken(NUMBER,'1',1,1789) +LexToken(CLOSEBRACKET,')',1,1790) +LexToken(COMMA,',',1,1791) +LexToken(VAR,'exprs',1,1792) +LexToken(CLOSEBRACKET,')',1,1797) +LexToken(EOL,'\n',1,1798) +LexToken(IF,'if',1,1811) +LexToken(NOT,'~',1,1814) +LexToken(VAR,'ok',1,1815) +LexToken(THEN,'then',1,1818) +LexToken(EOL,'\n',1,1822) +LexToken(BREAK,'break',1,1839) +LexToken(COMMA,',',1,1844) +LexToken(EOL,'\n',1,1845) +LexToken(END,'end',1,1858) +LexToken(EOL,'\n',1,1861) +LexToken(VAR,'model',1,1874) +LexToken(DOT,'.',1,1879) +LexToken(VAR,'rpar',1,1880) +LexToken(ASSIGNMENT,'=',1,1884) +LexToken(OPENSQBRACKET,'[',1,1885) +LexToken(VAR,'L',1,1886) +LexToken(SEMICOLON,';',1,1887) +LexToken(VAR,'D',1,1888) +LexToken(SEMICOLON,';',1,1889) +LexToken(VAR,'lambda',1,1890) LexToken(SEMICOLON,';',1,1896) -LexToken(VAR,'z2',1,1897) +LexToken(VAR,'z1',1,1897) LexToken(SEMICOLON,';',1,1899) -LexToken(VAR,'p_rho',1,1900) -LexToken(CLOSESQBRACKET,']',1,1905) -LexToken(EOL,'\n',1,1906) -LexToken(VAR,'model',1,1919) -LexToken(DOT,'.',1,1924) -LexToken(VAR,'equations',1,1925) -LexToken(DOT,'.',1,1934) -LexToken(VAR,'parameters',1,1935) -LexToken(OPENBRACKET,'(',1,1945) -LexToken(NUMBER,'2',1,1946) -LexToken(CLOSEBRACKET,')',1,1947) -LexToken(ASSIGNMENT,'=',1,1948) -LexToken(VAR,'list',1,1949) -LexToken(OPENBRACKET,'(',1,1953) -LexToken(VAR,'L',1,1954) -LexToken(COMMA,',',1,1955) -LexToken(VAR,'D',1,1956) -LexToken(COMMA,',',1,1957) -LexToken(VAR,'lambda',1,1958) -LexToken(COMMA,',',1,1964) -LexToken(VAR,'z1',1,1965) +LexToken(VAR,'z2',1,1900) +LexToken(SEMICOLON,';',1,1902) +LexToken(VAR,'p_rho',1,1903) +LexToken(CLOSESQBRACKET,']',1,1908) +LexToken(EOL,'\n',1,1909) +LexToken(VAR,'model',1,1922) +LexToken(DOT,'.',1,1927) +LexToken(VAR,'equations',1,1928) +LexToken(DOT,'.',1,1937) +LexToken(VAR,'parameters',1,1938) +LexToken(OPENBRACKET,'(',1,1948) +LexToken(NUMBER,'2',1,1949) +LexToken(CLOSEBRACKET,')',1,1950) +LexToken(ASSIGNMENT,'=',1,1951) +LexToken(VAR,'list',1,1952) +LexToken(OPENBRACKET,'(',1,1956) +LexToken(VAR,'L',1,1957) +LexToken(COMMA,',',1,1958) +LexToken(VAR,'D',1,1959) +LexToken(COMMA,',',1,1960) +LexToken(VAR,'lambda',1,1961) LexToken(COMMA,',',1,1967) -LexToken(VAR,'z2',1,1968) +LexToken(VAR,'z1',1,1968) LexToken(COMMA,',',1,1970) -LexToken(VAR,'p_rho',1,1971) -LexToken(CLOSEBRACKET,')',1,1976) -LexToken(EOL,'\n',1,1977) -LexToken(VAR,'graphics',1,1990) -LexToken(DOT,'.',1,1998) -LexToken(VAR,'exprs',1,1999) -LexToken(ASSIGNMENT,'=',1,2004) -LexToken(VAR,'exprs',1,2005) -LexToken(EOL,'\n',1,2010) -LexToken(VAR,'x',1,2023) -LexToken(DOT,'.',1,2024) -LexToken(VAR,'graphics',1,2025) -LexToken(ASSIGNMENT,'=',1,2033) -LexToken(VAR,'graphics',1,2034) -LexToken(SEMICOLON,';',1,2042) -LexToken(EOL,'\n',1,2043) -LexToken(VAR,'x',1,2056) -LexToken(DOT,'.',1,2057) -LexToken(VAR,'model',1,2058) -LexToken(ASSIGNMENT,'=',1,2063) -LexToken(VAR,'model',1,2064) -LexToken(EOL,'\n',1,2069) -LexToken(BREAK,'break',1,2082) -LexToken(EOL,'\n',1,2087) -LexToken(END,'end',1,2096) -LexToken(EOL,'\n',1,2099) -LexToken(CASE,'case',1,2104) -LexToken(DQSTRING,'"define"',1,2116) -LexToken(THEN,'then',1,2118) -LexToken(EOL,'\n',1,2122) -LexToken(VAR,'model',1,2131) -LexToken(ASSIGNMENT,'=',1,2136) -LexToken(SCICOS_MODEL,'scicos_model',1,2137) -LexToken(OPENBRACKET,'(',1,2149) -LexToken(CLOSEBRACKET,')',1,2150) -LexToken(EOL,'\n',1,2151) -LexToken(VAR,'model',1,2160) -LexToken(DOT,'.',1,2165) -LexToken(VAR,'in',1,2166) -LexToken(ASSIGNMENT,'=',1,2168) -LexToken(OPENSQBRACKET,'[',1,2169) -LexToken(NUMBER,'1',1,2170) -LexToken(CLOSESQBRACKET,']',1,2171) -LexToken(SEMICOLON,';',1,2172) -LexToken(EOL,'\n',1,2173) -LexToken(VAR,'model',1,2182) -LexToken(DOT,'.',1,2187) -LexToken(VAR,'out',1,2188) -LexToken(ASSIGNMENT,'=',1,2191) -LexToken(OPENSQBRACKET,'[',1,2192) -LexToken(NUMBER,'1',1,2193) -LexToken(CLOSESQBRACKET,']',1,2194) -LexToken(SEMICOLON,';',1,2195) -LexToken(EOL,'\n',1,2196) -LexToken(VAR,'L',1,2205) -LexToken(ASSIGNMENT,'=',1,2206) -LexToken(NUMBER,'10',1,2207) -LexToken(EOL,'\n',1,2209) -LexToken(VAR,'D',1,2218) -LexToken(ASSIGNMENT,'=',1,2219) -LexToken(NUMBER,'0.2',1,2220) -LexToken(EOL,'\n',1,2223) -LexToken(VAR,'lambda',1,2232) -LexToken(ASSIGNMENT,'=',1,2238) -LexToken(NUMBER,'0.03',1,2239) -LexToken(EOL,'\n',1,2243) -LexToken(VAR,'z1',1,2252) -LexToken(ASSIGNMENT,'=',1,2254) -LexToken(NUMBER,'0',1,2255) -LexToken(EOL,'\n',1,2256) -LexToken(VAR,'z2',1,2265) -LexToken(ASSIGNMENT,'=',1,2267) -LexToken(NUMBER,'0',1,2268) -LexToken(EOL,'\n',1,2269) -LexToken(VAR,'p_rho',1,2278) -LexToken(ASSIGNMENT,'=',1,2283) -LexToken(NUMBER,'0',1,2284) -LexToken(EOL,'\n',1,2285) -LexToken(VAR,'model',1,2294) -LexToken(DOT,'.',1,2299) -LexToken(VAR,'rpar',1,2300) -LexToken(ASSIGNMENT,'=',1,2304) -LexToken(OPENSQBRACKET,'[',1,2305) -LexToken(VAR,'L',1,2306) -LexToken(SEMICOLON,';',1,2307) -LexToken(VAR,'D',1,2308) -LexToken(SEMICOLON,';',1,2309) -LexToken(VAR,'lambda',1,2310) -LexToken(SEMICOLON,';',1,2316) -LexToken(VAR,'z1',1,2317) +LexToken(VAR,'z2',1,1971) +LexToken(COMMA,',',1,1973) +LexToken(VAR,'p_rho',1,1974) +LexToken(CLOSEBRACKET,')',1,1979) +LexToken(EOL,'\n',1,1980) +LexToken(VAR,'graphics',1,1993) +LexToken(DOT,'.',1,2001) +LexToken(VAR,'exprs',1,2002) +LexToken(ASSIGNMENT,'=',1,2007) +LexToken(VAR,'exprs',1,2008) +LexToken(EOL,'\n',1,2013) +LexToken(VAR,'x',1,2026) +LexToken(DOT,'.',1,2027) +LexToken(VAR,'graphics',1,2028) +LexToken(ASSIGNMENT,'=',1,2036) +LexToken(VAR,'graphics',1,2037) +LexToken(SEMICOLON,';',1,2045) +LexToken(EOL,'\n',1,2046) +LexToken(VAR,'x',1,2059) +LexToken(DOT,'.',1,2060) +LexToken(VAR,'model',1,2061) +LexToken(ASSIGNMENT,'=',1,2066) +LexToken(VAR,'model',1,2067) +LexToken(EOL,'\n',1,2072) +LexToken(BREAK,'break',1,2085) +LexToken(EOL,'\n',1,2090) +LexToken(END,'end',1,2099) +LexToken(EOL,'\n',1,2102) +LexToken(CASE,'case',1,2107) +LexToken(DQSTRING,'"define"',1,2119) +LexToken(THEN,'then',1,2121) +LexToken(EOL,'\n',1,2125) +LexToken(VAR,'model',1,2134) +LexToken(ASSIGNMENT,'=',1,2139) +LexToken(SCICOS_MODEL,'scicos_model',1,2140) +LexToken(OPENBRACKET,'(',1,2152) +LexToken(CLOSEBRACKET,')',1,2153) +LexToken(EOL,'\n',1,2154) +LexToken(VAR,'model',1,2163) +LexToken(DOT,'.',1,2168) +LexToken(VAR,'in',1,2169) +LexToken(ASSIGNMENT,'=',1,2171) +LexToken(OPENSQBRACKET,'[',1,2172) +LexToken(NUMBER,'1',1,2173) +LexToken(CLOSESQBRACKET,']',1,2174) +LexToken(SEMICOLON,';',1,2175) +LexToken(EOL,'\n',1,2176) +LexToken(VAR,'model',1,2185) +LexToken(DOT,'.',1,2190) +LexToken(VAR,'out',1,2191) +LexToken(ASSIGNMENT,'=',1,2194) +LexToken(OPENSQBRACKET,'[',1,2195) +LexToken(NUMBER,'1',1,2196) +LexToken(CLOSESQBRACKET,']',1,2197) +LexToken(SEMICOLON,';',1,2198) +LexToken(EOL,'\n',1,2199) +LexToken(VAR,'L',1,2208) +LexToken(ASSIGNMENT,'=',1,2209) +LexToken(NUMBER,'10',1,2210) +LexToken(EOL,'\n',1,2212) +LexToken(VAR,'D',1,2221) +LexToken(ASSIGNMENT,'=',1,2222) +LexToken(NUMBER,'0.2',1,2223) +LexToken(EOL,'\n',1,2226) +LexToken(VAR,'lambda',1,2235) +LexToken(ASSIGNMENT,'=',1,2241) +LexToken(NUMBER,'0.03',1,2242) +LexToken(EOL,'\n',1,2246) +LexToken(VAR,'z1',1,2255) +LexToken(ASSIGNMENT,'=',1,2257) +LexToken(NUMBER,'0',1,2258) +LexToken(EOL,'\n',1,2259) +LexToken(VAR,'z2',1,2268) +LexToken(ASSIGNMENT,'=',1,2270) +LexToken(NUMBER,'0',1,2271) +LexToken(EOL,'\n',1,2272) +LexToken(VAR,'p_rho',1,2281) +LexToken(ASSIGNMENT,'=',1,2286) +LexToken(NUMBER,'0',1,2287) +LexToken(EOL,'\n',1,2288) +LexToken(VAR,'model',1,2297) +LexToken(DOT,'.',1,2302) +LexToken(VAR,'rpar',1,2303) +LexToken(ASSIGNMENT,'=',1,2307) +LexToken(OPENSQBRACKET,'[',1,2308) +LexToken(VAR,'L',1,2309) +LexToken(SEMICOLON,';',1,2310) +LexToken(VAR,'D',1,2311) +LexToken(SEMICOLON,';',1,2312) +LexToken(VAR,'lambda',1,2313) LexToken(SEMICOLON,';',1,2319) -LexToken(VAR,'z2',1,2320) +LexToken(VAR,'z1',1,2320) LexToken(SEMICOLON,';',1,2322) -LexToken(VAR,'p_rho',1,2323) -LexToken(CLOSESQBRACKET,']',1,2328) -LexToken(EOL,'\n',1,2329) -LexToken(VAR,'model',1,2338) -LexToken(DOT,'.',1,2343) -LexToken(VAR,'sim',1,2344) -LexToken(ASSIGNMENT,'=',1,2347) -LexToken(DQSTRING,'"PerteDP"',1,2356) -LexToken(EOL,'\n',1,2357) -LexToken(VAR,'model',1,2366) -LexToken(DOT,'.',1,2371) -LexToken(VAR,'blocktype',1,2372) -LexToken(ASSIGNMENT,'=',1,2381) -LexToken(DQSTRING,'"c"',1,2384) -LexToken(EOL,'\n',1,2385) -LexToken(VAR,'model',1,2394) -LexToken(DOT,'.',1,2399) -LexToken(VAR,'dep_ut',1,2400) -LexToken(ASSIGNMENT,'=',1,2406) -LexToken(OPENSQBRACKET,'[',1,2407) -LexToken(PREVAR_BOOLEAN,'%t',1,2408) -LexToken(PREVAR_BOOLEAN,'%f',1,2411) -LexToken(CLOSESQBRACKET,']',1,2413) -LexToken(EOL,'\n',1,2414) -LexToken(VAR,'mo',1,2423) -LexToken(ASSIGNMENT,'=',1,2425) -LexToken(VAR,'modelica',1,2426) -LexToken(OPENBRACKET,'(',1,2434) -LexToken(CLOSEBRACKET,')',1,2435) -LexToken(EOL,'\n',1,2436) -LexToken(VAR,'mo',1,2445) -LexToken(DOT,'.',1,2447) -LexToken(VAR,'model',1,2448) -LexToken(ASSIGNMENT,'=',1,2453) -LexToken(DQSTRING,'"PerteDP"',1,2462) -LexToken(EOL,'\n',1,2463) -LexToken(VAR,'mo',1,2472) -LexToken(DOT,'.',1,2474) -LexToken(VAR,'inputs',1,2475) -LexToken(ASSIGNMENT,'=',1,2481) -LexToken(DQSTRING,'"C1"',1,2485) -LexToken(SEMICOLON,';',1,2486) -LexToken(EOL,'\n',1,2487) -LexToken(VAR,'mo',1,2496) -LexToken(DOT,'.',1,2498) -LexToken(VAR,'outputs',1,2499) -LexToken(ASSIGNMENT,'=',1,2506) -LexToken(DQSTRING,'"C2"',1,2510) -LexToken(SEMICOLON,';',1,2511) -LexToken(EOL,'\n',1,2512) -LexToken(VAR,'mo',1,2521) -LexToken(DOT,'.',1,2523) -LexToken(VAR,'parameters',1,2524) -LexToken(ASSIGNMENT,'=',1,2534) -LexToken(VAR,'list',1,2535) -LexToken(OPENBRACKET,'(',1,2539) -LexToken(OPENSQBRACKET,'[',1,2540) -LexToken(DQSTRING,'"L"',1,2543) -LexToken(SEMICOLON,';',1,2544) -LexToken(DQSTRING,'"D"',1,2547) -LexToken(SEMICOLON,';',1,2548) -LexToken(DQSTRING,'"lambda"',1,2556) -LexToken(SEMICOLON,';',1,2557) -LexToken(DQSTRING,'"z1"',1,2561) -LexToken(SEMICOLON,';',1,2562) -LexToken(DQSTRING,'"z2"',1,2566) -LexToken(SEMICOLON,';',1,2567) -LexToken(DQSTRING,'"p_rho"',1,2574) -LexToken(CLOSESQBRACKET,']',1,2575) -LexToken(COMMA,',',1,2576) -LexToken(OPENSQBRACKET,'[',1,2577) -LexToken(VAR,'L',1,2578) -LexToken(SEMICOLON,';',1,2579) -LexToken(VAR,'D',1,2580) -LexToken(SEMICOLON,';',1,2581) -LexToken(VAR,'lambda',1,2582) -LexToken(SEMICOLON,';',1,2588) -LexToken(VAR,'z1',1,2589) +LexToken(VAR,'z2',1,2323) +LexToken(SEMICOLON,';',1,2325) +LexToken(VAR,'p_rho',1,2326) +LexToken(CLOSESQBRACKET,']',1,2331) +LexToken(EOL,'\n',1,2332) +LexToken(VAR,'model',1,2341) +LexToken(DOT,'.',1,2346) +LexToken(VAR,'sim',1,2347) +LexToken(ASSIGNMENT,'=',1,2350) +LexToken(DQSTRING,'"PerteDP"',1,2359) +LexToken(EOL,'\n',1,2360) +LexToken(VAR,'model',1,2369) +LexToken(DOT,'.',1,2374) +LexToken(VAR,'blocktype',1,2375) +LexToken(ASSIGNMENT,'=',1,2384) +LexToken(DQSTRING,'"c"',1,2387) +LexToken(EOL,'\n',1,2388) +LexToken(VAR,'model',1,2397) +LexToken(DOT,'.',1,2402) +LexToken(VAR,'dep_ut',1,2403) +LexToken(ASSIGNMENT,'=',1,2409) +LexToken(OPENSQBRACKET,'[',1,2410) +LexToken(PREVAR_BOOLEAN,'%t',1,2411) +LexToken(PREVAR_BOOLEAN,'%f',1,2414) +LexToken(CLOSESQBRACKET,']',1,2416) +LexToken(EOL,'\n',1,2417) +LexToken(VAR,'mo',1,2426) +LexToken(ASSIGNMENT,'=',1,2428) +LexToken(VAR,'modelica',1,2429) +LexToken(OPENBRACKET,'(',1,2437) +LexToken(CLOSEBRACKET,')',1,2438) +LexToken(EOL,'\n',1,2439) +LexToken(VAR,'mo',1,2448) +LexToken(DOT,'.',1,2450) +LexToken(VAR,'model',1,2451) +LexToken(ASSIGNMENT,'=',1,2456) +LexToken(DQSTRING,'"PerteDP"',1,2465) +LexToken(EOL,'\n',1,2466) +LexToken(VAR,'mo',1,2475) +LexToken(DOT,'.',1,2477) +LexToken(VAR,'inputs',1,2478) +LexToken(ASSIGNMENT,'=',1,2484) +LexToken(DQSTRING,'"C1"',1,2488) +LexToken(SEMICOLON,';',1,2489) +LexToken(EOL,'\n',1,2490) +LexToken(VAR,'mo',1,2499) +LexToken(DOT,'.',1,2501) +LexToken(VAR,'outputs',1,2502) +LexToken(ASSIGNMENT,'=',1,2509) +LexToken(DQSTRING,'"C2"',1,2513) +LexToken(SEMICOLON,';',1,2514) +LexToken(EOL,'\n',1,2515) +LexToken(VAR,'mo',1,2524) +LexToken(DOT,'.',1,2526) +LexToken(VAR,'parameters',1,2527) +LexToken(ASSIGNMENT,'=',1,2537) +LexToken(VAR,'list',1,2538) +LexToken(OPENBRACKET,'(',1,2542) +LexToken(OPENSQBRACKET,'[',1,2543) +LexToken(DQSTRING,'"L"',1,2546) +LexToken(SEMICOLON,';',1,2547) +LexToken(DQSTRING,'"D"',1,2550) +LexToken(SEMICOLON,';',1,2551) +LexToken(DQSTRING,'"lambda"',1,2559) +LexToken(SEMICOLON,';',1,2560) +LexToken(DQSTRING,'"z1"',1,2564) +LexToken(SEMICOLON,';',1,2565) +LexToken(DQSTRING,'"z2"',1,2569) +LexToken(SEMICOLON,';',1,2570) +LexToken(DQSTRING,'"p_rho"',1,2577) +LexToken(CLOSESQBRACKET,']',1,2578) +LexToken(COMMA,',',1,2579) +LexToken(OPENSQBRACKET,'[',1,2580) +LexToken(VAR,'L',1,2581) +LexToken(SEMICOLON,';',1,2582) +LexToken(VAR,'D',1,2583) +LexToken(SEMICOLON,';',1,2584) +LexToken(VAR,'lambda',1,2585) LexToken(SEMICOLON,';',1,2591) -LexToken(VAR,'z2',1,2592) +LexToken(VAR,'z1',1,2592) LexToken(SEMICOLON,';',1,2594) -LexToken(VAR,'p_rho',1,2595) -LexToken(CLOSESQBRACKET,']',1,2600) -LexToken(CLOSEBRACKET,')',1,2601) -LexToken(EOL,'\n',1,2602) -LexToken(VAR,'model',1,2611) -LexToken(DOT,'.',1,2616) -LexToken(VAR,'equations',1,2617) -LexToken(ASSIGNMENT,'=',1,2626) -LexToken(VAR,'mo',1,2627) -LexToken(EOL,'\n',1,2629) -LexToken(VAR,'model',1,2638) -LexToken(DOT,'.',1,2643) -LexToken(VAR,'in',1,2644) -LexToken(ASSIGNMENT,'=',1,2646) -LexToken(VAR,'ones',1,2647) -LexToken(OPENBRACKET,'(',1,2651) -LexToken(VAR,'size',1,2652) -LexToken(OPENBRACKET,'(',1,2656) -LexToken(VAR,'mo',1,2657) -LexToken(DOT,'.',1,2659) -LexToken(VAR,'inputs',1,2660) -LexToken(COMMA,',',1,2666) -LexToken(DQSTRING,'"*"',1,2669) -LexToken(CLOSEBRACKET,')',1,2670) -LexToken(COMMA,',',1,2671) -LexToken(NUMBER,'1',1,2672) +LexToken(VAR,'z2',1,2595) +LexToken(SEMICOLON,';',1,2597) +LexToken(VAR,'p_rho',1,2598) +LexToken(CLOSESQBRACKET,']',1,2603) +LexToken(CLOSEBRACKET,')',1,2604) +LexToken(EOL,'\n',1,2605) +LexToken(VAR,'model',1,2614) +LexToken(DOT,'.',1,2619) +LexToken(VAR,'equations',1,2620) +LexToken(ASSIGNMENT,'=',1,2629) +LexToken(VAR,'mo',1,2630) +LexToken(EOL,'\n',1,2632) +LexToken(VAR,'model',1,2641) +LexToken(DOT,'.',1,2646) +LexToken(VAR,'in',1,2647) +LexToken(ASSIGNMENT,'=',1,2649) +LexToken(VAR,'ones',1,2650) +LexToken(OPENBRACKET,'(',1,2654) +LexToken(VAR,'size',1,2655) +LexToken(OPENBRACKET,'(',1,2659) +LexToken(VAR,'mo',1,2660) +LexToken(DOT,'.',1,2662) +LexToken(VAR,'inputs',1,2663) +LexToken(COMMA,',',1,2669) +LexToken(DQSTRING,'"*"',1,2672) LexToken(CLOSEBRACKET,')',1,2673) -LexToken(EOL,'\n',1,2674) -LexToken(VAR,'model',1,2683) -LexToken(DOT,'.',1,2688) -LexToken(VAR,'out',1,2689) -LexToken(ASSIGNMENT,'=',1,2692) -LexToken(VAR,'ones',1,2693) -LexToken(OPENBRACKET,'(',1,2697) -LexToken(VAR,'size',1,2698) -LexToken(OPENBRACKET,'(',1,2702) -LexToken(VAR,'mo',1,2703) -LexToken(DOT,'.',1,2705) -LexToken(VAR,'outputs',1,2706) -LexToken(COMMA,',',1,2713) -LexToken(DQSTRING,'"*"',1,2716) -LexToken(CLOSEBRACKET,')',1,2717) -LexToken(COMMA,',',1,2718) -LexToken(NUMBER,'1',1,2719) +LexToken(COMMA,',',1,2674) +LexToken(NUMBER,'1',1,2675) +LexToken(CLOSEBRACKET,')',1,2676) +LexToken(EOL,'\n',1,2677) +LexToken(VAR,'model',1,2686) +LexToken(DOT,'.',1,2691) +LexToken(VAR,'out',1,2692) +LexToken(ASSIGNMENT,'=',1,2695) +LexToken(VAR,'ones',1,2696) +LexToken(OPENBRACKET,'(',1,2700) +LexToken(VAR,'size',1,2701) +LexToken(OPENBRACKET,'(',1,2705) +LexToken(VAR,'mo',1,2706) +LexToken(DOT,'.',1,2708) +LexToken(VAR,'outputs',1,2709) +LexToken(COMMA,',',1,2716) +LexToken(DQSTRING,'"*"',1,2719) LexToken(CLOSEBRACKET,')',1,2720) -LexToken(EOL,'\n',1,2721) -LexToken(VAR,'exprs',1,2730) -LexToken(ASSIGNMENT,'=',1,2735) -LexToken(OPENSQBRACKET,'[',1,2736) -LexToken(VAR,'string',1,2737) -LexToken(OPENBRACKET,'(',1,2743) -LexToken(VAR,'L',1,2744) -LexToken(CLOSEBRACKET,')',1,2745) -LexToken(SEMICOLON,';',1,2746) -LexToken(VAR,'string',1,2747) -LexToken(OPENBRACKET,'(',1,2753) -LexToken(VAR,'D',1,2754) -LexToken(CLOSEBRACKET,')',1,2755) -LexToken(SEMICOLON,';',1,2756) -LexToken(VAR,'string',1,2757) -LexToken(OPENBRACKET,'(',1,2763) -LexToken(VAR,'lambda',1,2764) -LexToken(CLOSEBRACKET,')',1,2770) -LexToken(SEMICOLON,';',1,2771) -LexToken(VAR,'string',1,2772) -LexToken(OPENBRACKET,'(',1,2778) -LexToken(VAR,'z1',1,2779) -LexToken(CLOSEBRACKET,')',1,2781) -LexToken(SEMICOLON,';',1,2782) -LexToken(VAR,'string',1,2783) -LexToken(OPENBRACKET,'(',1,2789) -LexToken(VAR,'z2',1,2790) -LexToken(CLOSEBRACKET,')',1,2792) -LexToken(SEMICOLON,';',1,2793) -LexToken(VAR,'string',1,2794) -LexToken(OPENBRACKET,'(',1,2800) -LexToken(VAR,'p_rho',1,2801) -LexToken(CLOSEBRACKET,')',1,2806) -LexToken(CLOSESQBRACKET,']',1,2807) -LexToken(EOL,'\n',1,2808) -LexToken(VAR,'gr_i',1,2817) -LexToken(ASSIGNMENT,'=',1,2821) -LexToken(OPENSQBRACKET,'[',1,2822) -LexToken(CLOSESQBRACKET,']',1,2823) -LexToken(SEMICOLON,';',1,2824) -LexToken(EOL,'\n',1,2825) -LexToken(VAR,'x',1,2834) -LexToken(ASSIGNMENT,'=',1,2835) -LexToken(VAR,'standard_define',1,2836) -LexToken(OPENBRACKET,'(',1,2851) -LexToken(OPENSQBRACKET,'[',1,2852) -LexToken(NUMBER,'2',1,2853) -LexToken(NUMBER,'1',1,2855) -LexToken(CLOSESQBRACKET,']',1,2856) -LexToken(COMMA,',',1,2857) -LexToken(VAR,'model',1,2858) -LexToken(COMMA,',',1,2863) -LexToken(VAR,'exprs',1,2864) -LexToken(COMMA,',',1,2869) -LexToken(VAR,'list',1,2870) -LexToken(OPENBRACKET,'(',1,2874) -LexToken(VAR,'gr_i',1,2875) -LexToken(COMMA,',',1,2879) -LexToken(NUMBER,'0',1,2880) -LexToken(CLOSEBRACKET,')',1,2881) -LexToken(CLOSEBRACKET,')',1,2882) -LexToken(EOL,'\n',1,2883) -LexToken(VAR,'x',1,2892) -LexToken(DOT,'.',1,2893) -LexToken(VAR,'graphics',1,2894) -LexToken(DOT,'.',1,2902) -LexToken(VAR,'in_implicit',1,2903) -LexToken(ASSIGNMENT,'=',1,2914) -LexToken(OPENSQBRACKET,'[',1,2915) -LexToken(DQSTRING,'"I"',1,2918) -LexToken(CLOSESQBRACKET,']',1,2919) -LexToken(EOL,'\n',1,2920) -LexToken(VAR,'x',1,2929) -LexToken(DOT,'.',1,2930) -LexToken(VAR,'graphics',1,2931) -LexToken(DOT,'.',1,2939) -LexToken(VAR,'out_implicit',1,2940) -LexToken(ASSIGNMENT,'=',1,2952) -LexToken(OPENSQBRACKET,'[',1,2953) -LexToken(DQSTRING,'"I"',1,2956) -LexToken(CLOSESQBRACKET,']',1,2957) -LexToken(EOL,'\n',1,2958) -LexToken(END,'end',1,2963) -LexToken(EOL,'\n',1,2966) -LexToken(ENDFUNCTION,'endfunction',1,2967) -LexToken(EOL,'\n',1,2978) +LexToken(COMMA,',',1,2721) +LexToken(NUMBER,'1',1,2722) +LexToken(CLOSEBRACKET,')',1,2723) +LexToken(EOL,'\n',1,2724) +LexToken(VAR,'exprs',1,2733) +LexToken(ASSIGNMENT,'=',1,2738) +LexToken(OPENSQBRACKET,'[',1,2739) +LexToken(VAR,'string',1,2740) +LexToken(OPENBRACKET,'(',1,2746) +LexToken(VAR,'L',1,2747) +LexToken(CLOSEBRACKET,')',1,2748) +LexToken(SEMICOLON,';',1,2749) +LexToken(VAR,'string',1,2750) +LexToken(OPENBRACKET,'(',1,2756) +LexToken(VAR,'D',1,2757) +LexToken(CLOSEBRACKET,')',1,2758) +LexToken(SEMICOLON,';',1,2759) +LexToken(VAR,'string',1,2760) +LexToken(OPENBRACKET,'(',1,2766) +LexToken(VAR,'lambda',1,2767) +LexToken(CLOSEBRACKET,')',1,2773) +LexToken(SEMICOLON,';',1,2774) +LexToken(VAR,'string',1,2775) +LexToken(OPENBRACKET,'(',1,2781) +LexToken(VAR,'z1',1,2782) +LexToken(CLOSEBRACKET,')',1,2784) +LexToken(SEMICOLON,';',1,2785) +LexToken(VAR,'string',1,2786) +LexToken(OPENBRACKET,'(',1,2792) +LexToken(VAR,'z2',1,2793) +LexToken(CLOSEBRACKET,')',1,2795) +LexToken(SEMICOLON,';',1,2796) +LexToken(VAR,'string',1,2797) +LexToken(OPENBRACKET,'(',1,2803) +LexToken(VAR,'p_rho',1,2804) +LexToken(CLOSEBRACKET,')',1,2809) +LexToken(CLOSESQBRACKET,']',1,2810) +LexToken(EOL,'\n',1,2811) +LexToken(VAR,'gr_i',1,2820) +LexToken(ASSIGNMENT,'=',1,2824) +LexToken(OPENSQBRACKET,'[',1,2825) +LexToken(CLOSESQBRACKET,']',1,2826) +LexToken(SEMICOLON,';',1,2827) +LexToken(EOL,'\n',1,2828) +LexToken(VAR,'x',1,2837) +LexToken(ASSIGNMENT,'=',1,2838) +LexToken(VAR,'standard_define',1,2839) +LexToken(OPENBRACKET,'(',1,2854) +LexToken(OPENSQBRACKET,'[',1,2855) +LexToken(NUMBER,'2',1,2856) +LexToken(NUMBER,'1',1,2858) +LexToken(CLOSESQBRACKET,']',1,2859) +LexToken(COMMA,',',1,2860) +LexToken(VAR,'model',1,2861) +LexToken(COMMA,',',1,2866) +LexToken(VAR,'exprs',1,2867) +LexToken(COMMA,',',1,2872) +LexToken(VAR,'list',1,2873) +LexToken(OPENBRACKET,'(',1,2877) +LexToken(VAR,'gr_i',1,2878) +LexToken(COMMA,',',1,2882) +LexToken(NUMBER,'0',1,2883) +LexToken(CLOSEBRACKET,')',1,2884) +LexToken(CLOSEBRACKET,')',1,2885) +LexToken(EOL,'\n',1,2886) +LexToken(VAR,'x',1,2895) +LexToken(DOT,'.',1,2896) +LexToken(VAR,'graphics',1,2897) +LexToken(DOT,'.',1,2905) +LexToken(VAR,'in_implicit',1,2906) +LexToken(ASSIGNMENT,'=',1,2917) +LexToken(OPENSQBRACKET,'[',1,2918) +LexToken(DQSTRING,'"I"',1,2921) +LexToken(CLOSESQBRACKET,']',1,2922) +LexToken(EOL,'\n',1,2923) +LexToken(VAR,'x',1,2932) +LexToken(DOT,'.',1,2933) +LexToken(VAR,'graphics',1,2934) +LexToken(DOT,'.',1,2942) +LexToken(VAR,'out_implicit',1,2943) +LexToken(ASSIGNMENT,'=',1,2955) +LexToken(OPENSQBRACKET,'[',1,2956) +LexToken(DQSTRING,'"I"',1,2959) +LexToken(CLOSESQBRACKET,']',1,2960) +LexToken(EOL,'\n',1,2961) +LexToken(END,'end',1,2966) +LexToken(EOL,'\n',1,2969) +LexToken(ENDFUNCTION,'endfunction',1,2970) +LexToken(EOL,'\n',1,2981) diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 4eae0325..1e8efbeb 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -112,306 +112,310 @@ LexToken(CLOSESQBRACKET,']',1,1330) LexToken(ASSIGNMENT,'=',1,1331) LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1332) LexToken(OPENBRACKET,'(',1,1347) -LexToken(DQSTRING,'"Paramètres du puits"',1,1368) -LexToken(COMMA,',',1,1369) -LexToken(OPENSQBRACKET,'[',1,1386) -LexToken(DQSTRING,'"Pression de la source : P0 (Pa)"',1,1419) -LexToken(SEMICOLON,';',1,1420) -LexToken(DQSTRING,'"Temperature de la source : T0 (K)"',1,1470) -LexToken(SEMICOLON,';',1,1471) -LexToken(DQSTRING,'"Enthalpie spécifique de la source : H0 (J/kg)"',1,1533) -LexToken(SEMICOLON,';',1,1534) -LexToken(DQSTRING,'"1:température fixée - 2:enthalpie fixée : option_temperature"',1,1611) -LexToken(CLOSESQBRACKET,']',1,1612) -LexToken(COMMA,',',1,1613) -LexToken(VAR,'list',1,1630) -LexToken(OPENBRACKET,'(',1,1634) -LexToken(DQSTRING,'"vec"',1,1639) -LexToken(COMMA,',',1,1640) -LexToken(NUMBER,'-1',1,1641) -LexToken(COMMA,',',1,1643) -LexToken(DQSTRING,'"vec"',1,1648) -LexToken(COMMA,',',1,1649) -LexToken(NUMBER,'-1',1,1650) -LexToken(COMMA,',',1,1652) -LexToken(DQSTRING,'"vec"',1,1657) -LexToken(COMMA,',',1,1658) -LexToken(NUMBER,'-1',1,1659) -LexToken(COMMA,',',1,1661) -LexToken(DQSTRING,'"vec"',1,1666) -LexToken(COMMA,',',1,1667) -LexToken(NUMBER,'-1',1,1668) -LexToken(CLOSEBRACKET,')',1,1670) -LexToken(COMMA,',',1,1671) -LexToken(VAR,'exprs',1,1672) -LexToken(CLOSEBRACKET,')',1,1677) -LexToken(EOL,'\n',1,1678) -LexToken(IF,'if',1,1691) -LexToken(NOT,'~',1,1694) -LexToken(VAR,'ok',1,1695) -LexToken(THEN,'then',1,1698) -LexToken(EOL,'\n',1,1702) -LexToken(BREAK,'break',1,1719) -LexToken(COMMA,',',1,1724) -LexToken(EOL,'\n',1,1725) -LexToken(END,'end',1,1738) -LexToken(EOL,'\n',1,1741) -LexToken(VAR,'model',1,1754) -LexToken(DOT,'.',1,1759) -LexToken(VAR,'rpar',1,1760) -LexToken(ASSIGNMENT,'=',1,1764) -LexToken(OPENSQBRACKET,'[',1,1765) -LexToken(VAR,'P0',1,1766) -LexToken(SEMICOLON,';',1,1768) -LexToken(VAR,'T0',1,1769) -LexToken(SEMICOLON,';',1,1771) -LexToken(VAR,'H0',1,1772) -LexToken(SEMICOLON,';',1,1774) -LexToken(VAR,'option_temperature',1,1775) -LexToken(CLOSESQBRACKET,']',1,1793) -LexToken(EOL,'\n',1,1794) -LexToken(VAR,'model',1,1807) -LexToken(DOT,'.',1,1812) -LexToken(VAR,'equations',1,1813) -LexToken(DOT,'.',1,1822) -LexToken(VAR,'parameters',1,1823) -LexToken(OPENBRACKET,'(',1,1833) -LexToken(NUMBER,'2',1,1834) -LexToken(CLOSEBRACKET,')',1,1835) -LexToken(ASSIGNMENT,'=',1,1836) -LexToken(VAR,'list',1,1837) -LexToken(OPENBRACKET,'(',1,1841) -LexToken(VAR,'P0',1,1842) -LexToken(COMMA,',',1,1844) -LexToken(VAR,'T0',1,1845) -LexToken(COMMA,',',1,1847) -LexToken(VAR,'H0',1,1848) -LexToken(COMMA,',',1,1850) -LexToken(VAR,'option_temperature',1,1851) -LexToken(CLOSEBRACKET,')',1,1869) -LexToken(EOL,'\n',1,1870) -LexToken(VAR,'graphics',1,1883) -LexToken(DOT,'.',1,1891) -LexToken(VAR,'exprs',1,1892) -LexToken(ASSIGNMENT,'=',1,1897) -LexToken(VAR,'exprs',1,1898) -LexToken(EOL,'\n',1,1903) -LexToken(VAR,'x',1,1916) -LexToken(DOT,'.',1,1917) -LexToken(VAR,'graphics',1,1918) -LexToken(ASSIGNMENT,'=',1,1926) -LexToken(VAR,'graphics',1,1927) -LexToken(SEMICOLON,';',1,1935) -LexToken(EOL,'\n',1,1936) -LexToken(VAR,'x',1,1949) -LexToken(DOT,'.',1,1950) -LexToken(VAR,'model',1,1951) -LexToken(ASSIGNMENT,'=',1,1956) -LexToken(VAR,'model',1,1957) -LexToken(EOL,'\n',1,1962) -LexToken(BREAK,'break',1,1975) -LexToken(EOL,'\n',1,1980) -LexToken(END,'end',1,1989) -LexToken(EOL,'\n',1,1992) -LexToken(CASE,'case',1,1997) -LexToken(DQSTRING,'"define"',1,2009) -LexToken(THEN,'then',1,2011) -LexToken(EOL,'\n',1,2015) -LexToken(VAR,'model',1,2024) -LexToken(ASSIGNMENT,'=',1,2029) -LexToken(SCICOS_MODEL,'scicos_model',1,2030) -LexToken(OPENBRACKET,'(',1,2042) -LexToken(CLOSEBRACKET,')',1,2043) -LexToken(EOL,'\n',1,2044) -LexToken(VAR,'P0',1,2053) -LexToken(ASSIGNMENT,'=',1,2055) -LexToken(NUMBER,'100000',1,2056) -LexToken(EOL,'\n',1,2062) -LexToken(VAR,'T0',1,2071) -LexToken(ASSIGNMENT,'=',1,2073) -LexToken(NUMBER,'290',1,2074) -LexToken(EOL,'\n',1,2077) -LexToken(VAR,'H0',1,2086) -LexToken(ASSIGNMENT,'=',1,2088) -LexToken(NUMBER,'100000',1,2089) -LexToken(EOL,'\n',1,2095) -LexToken(VAR,'option_temperature',1,2104) -LexToken(ASSIGNMENT,'=',1,2122) -LexToken(NUMBER,'1',1,2123) -LexToken(EOL,'\n',1,2124) -LexToken(VAR,'model',1,2133) -LexToken(DOT,'.',1,2138) -LexToken(VAR,'rpar',1,2139) -LexToken(ASSIGNMENT,'=',1,2143) -LexToken(OPENSQBRACKET,'[',1,2144) -LexToken(VAR,'P0',1,2145) -LexToken(SEMICOLON,';',1,2147) -LexToken(VAR,'T0',1,2148) -LexToken(SEMICOLON,';',1,2150) -LexToken(VAR,'H0',1,2151) -LexToken(SEMICOLON,';',1,2153) -LexToken(VAR,'option_temperature',1,2154) -LexToken(CLOSESQBRACKET,']',1,2172) -LexToken(EOL,'\n',1,2173) -LexToken(VAR,'model',1,2182) -LexToken(DOT,'.',1,2187) -LexToken(VAR,'sim',1,2188) -LexToken(ASSIGNMENT,'=',1,2191) -LexToken(DQSTRING,'"Puits"',1,2198) -LexToken(EOL,'\n',1,2199) -LexToken(VAR,'model',1,2208) -LexToken(DOT,'.',1,2213) -LexToken(VAR,'blocktype',1,2214) -LexToken(ASSIGNMENT,'=',1,2223) -LexToken(DQSTRING,'"c"',1,2226) -LexToken(EOL,'\n',1,2227) -LexToken(VAR,'model',1,2236) -LexToken(DOT,'.',1,2241) -LexToken(VAR,'dep_ut',1,2242) -LexToken(ASSIGNMENT,'=',1,2248) -LexToken(OPENSQBRACKET,'[',1,2249) -LexToken(PREVAR_BOOLEAN,'%t',1,2250) -LexToken(PREVAR_BOOLEAN,'%f',1,2253) -LexToken(CLOSESQBRACKET,']',1,2255) -LexToken(EOL,'\n',1,2256) -LexToken(EOL,'\n',1,2257) -LexToken(VAR,'mo',1,2266) -LexToken(ASSIGNMENT,'=',1,2268) -LexToken(VAR,'modelica',1,2269) -LexToken(OPENBRACKET,'(',1,2277) -LexToken(CLOSEBRACKET,')',1,2278) -LexToken(EOL,'\n',1,2279) -LexToken(VAR,'mo',1,2288) -LexToken(DOT,'.',1,2290) -LexToken(VAR,'model',1,2291) -LexToken(ASSIGNMENT,'=',1,2296) -LexToken(DQSTRING,'"Puits"',1,2303) -LexToken(EOL,'\n',1,2304) -LexToken(VAR,'mo',1,2313) -LexToken(DOT,'.',1,2315) -LexToken(VAR,'inputs',1,2316) -LexToken(ASSIGNMENT,'=',1,2322) -LexToken(OPENSQBRACKET,'[',1,2323) -LexToken(DQSTRING,'"C"',1,2326) -LexToken(CLOSESQBRACKET,']',1,2327) -LexToken(SEMICOLON,';',1,2328) -LexToken(EOL,'\n',1,2329) -LexToken(VAR,'mo',1,2338) -LexToken(DOT,'.',1,2340) -LexToken(VAR,'parameters',1,2341) -LexToken(ASSIGNMENT,'=',1,2351) -LexToken(VAR,'list',1,2352) -LexToken(OPENBRACKET,'(',1,2356) -LexToken(OPENSQBRACKET,'[',1,2357) -LexToken(DQSTRING,'"P0"',1,2361) -LexToken(SEMICOLON,';',1,2362) -LexToken(DQSTRING,'"T0"',1,2366) +LexToken(DQSTRING,'"Param\xc3\xa8tres du puits"',1,1369) +LexToken(COMMA,',',1,1370) +LexToken(OPENSQBRACKET,'[',1,1387) +LexToken(DQSTRING,'"Pression de la source : P0 (Pa)"',1,1420) +LexToken(SEMICOLON,';',1,1421) +LexToken(DQSTRING,'"Temperature de la source : T0 (K)"',1,1471) +LexToken(SEMICOLON,';',1,1472) +LexToken(DQSTRING,'"Enthalpie sp\xc3\xa9cifique de la source : H0 (J/kg)"',1,1535) +LexToken(SEMICOLON,';',1,1536) +LexToken(DQSTRING,'"1:temp\xc3\xa9rature fix\xc3\xa9e - 2:enthalpie fix\xc3\xa9e : option_temperature"',1,1616) +LexToken(CLOSESQBRACKET,']',1,1617) +LexToken(COMMA,',',1,1618) +LexToken(VAR,'list',1,1635) +LexToken(OPENBRACKET,'(',1,1639) +LexToken(DQSTRING,'"vec"',1,1644) +LexToken(COMMA,',',1,1645) +LexToken(ADDITION,'-',1,1646) +LexToken(NUMBER,'1',1,1647) +LexToken(COMMA,',',1,1648) +LexToken(DQSTRING,'"vec"',1,1653) +LexToken(COMMA,',',1,1654) +LexToken(ADDITION,'-',1,1655) +LexToken(NUMBER,'1',1,1656) +LexToken(COMMA,',',1,1657) +LexToken(DQSTRING,'"vec"',1,1662) +LexToken(COMMA,',',1,1663) +LexToken(ADDITION,'-',1,1664) +LexToken(NUMBER,'1',1,1665) +LexToken(COMMA,',',1,1666) +LexToken(DQSTRING,'"vec"',1,1671) +LexToken(COMMA,',',1,1672) +LexToken(ADDITION,'-',1,1673) +LexToken(NUMBER,'1',1,1674) +LexToken(CLOSEBRACKET,')',1,1675) +LexToken(COMMA,',',1,1676) +LexToken(VAR,'exprs',1,1677) +LexToken(CLOSEBRACKET,')',1,1682) +LexToken(EOL,'\n',1,1683) +LexToken(IF,'if',1,1696) +LexToken(NOT,'~',1,1699) +LexToken(VAR,'ok',1,1700) +LexToken(THEN,'then',1,1703) +LexToken(EOL,'\n',1,1707) +LexToken(BREAK,'break',1,1724) +LexToken(COMMA,',',1,1729) +LexToken(EOL,'\n',1,1730) +LexToken(END,'end',1,1743) +LexToken(EOL,'\n',1,1746) +LexToken(VAR,'model',1,1759) +LexToken(DOT,'.',1,1764) +LexToken(VAR,'rpar',1,1765) +LexToken(ASSIGNMENT,'=',1,1769) +LexToken(OPENSQBRACKET,'[',1,1770) +LexToken(VAR,'P0',1,1771) +LexToken(SEMICOLON,';',1,1773) +LexToken(VAR,'T0',1,1774) +LexToken(SEMICOLON,';',1,1776) +LexToken(VAR,'H0',1,1777) +LexToken(SEMICOLON,';',1,1779) +LexToken(VAR,'option_temperature',1,1780) +LexToken(CLOSESQBRACKET,']',1,1798) +LexToken(EOL,'\n',1,1799) +LexToken(VAR,'model',1,1812) +LexToken(DOT,'.',1,1817) +LexToken(VAR,'equations',1,1818) +LexToken(DOT,'.',1,1827) +LexToken(VAR,'parameters',1,1828) +LexToken(OPENBRACKET,'(',1,1838) +LexToken(NUMBER,'2',1,1839) +LexToken(CLOSEBRACKET,')',1,1840) +LexToken(ASSIGNMENT,'=',1,1841) +LexToken(VAR,'list',1,1842) +LexToken(OPENBRACKET,'(',1,1846) +LexToken(VAR,'P0',1,1847) +LexToken(COMMA,',',1,1849) +LexToken(VAR,'T0',1,1850) +LexToken(COMMA,',',1,1852) +LexToken(VAR,'H0',1,1853) +LexToken(COMMA,',',1,1855) +LexToken(VAR,'option_temperature',1,1856) +LexToken(CLOSEBRACKET,')',1,1874) +LexToken(EOL,'\n',1,1875) +LexToken(VAR,'graphics',1,1888) +LexToken(DOT,'.',1,1896) +LexToken(VAR,'exprs',1,1897) +LexToken(ASSIGNMENT,'=',1,1902) +LexToken(VAR,'exprs',1,1903) +LexToken(EOL,'\n',1,1908) +LexToken(VAR,'x',1,1921) +LexToken(DOT,'.',1,1922) +LexToken(VAR,'graphics',1,1923) +LexToken(ASSIGNMENT,'=',1,1931) +LexToken(VAR,'graphics',1,1932) +LexToken(SEMICOLON,';',1,1940) +LexToken(EOL,'\n',1,1941) +LexToken(VAR,'x',1,1954) +LexToken(DOT,'.',1,1955) +LexToken(VAR,'model',1,1956) +LexToken(ASSIGNMENT,'=',1,1961) +LexToken(VAR,'model',1,1962) +LexToken(EOL,'\n',1,1967) +LexToken(BREAK,'break',1,1980) +LexToken(EOL,'\n',1,1985) +LexToken(END,'end',1,1994) +LexToken(EOL,'\n',1,1997) +LexToken(CASE,'case',1,2002) +LexToken(DQSTRING,'"define"',1,2014) +LexToken(THEN,'then',1,2016) +LexToken(EOL,'\n',1,2020) +LexToken(VAR,'model',1,2029) +LexToken(ASSIGNMENT,'=',1,2034) +LexToken(SCICOS_MODEL,'scicos_model',1,2035) +LexToken(OPENBRACKET,'(',1,2047) +LexToken(CLOSEBRACKET,')',1,2048) +LexToken(EOL,'\n',1,2049) +LexToken(VAR,'P0',1,2058) +LexToken(ASSIGNMENT,'=',1,2060) +LexToken(NUMBER,'100000',1,2061) +LexToken(EOL,'\n',1,2067) +LexToken(VAR,'T0',1,2076) +LexToken(ASSIGNMENT,'=',1,2078) +LexToken(NUMBER,'290',1,2079) +LexToken(EOL,'\n',1,2082) +LexToken(VAR,'H0',1,2091) +LexToken(ASSIGNMENT,'=',1,2093) +LexToken(NUMBER,'100000',1,2094) +LexToken(EOL,'\n',1,2100) +LexToken(VAR,'option_temperature',1,2109) +LexToken(ASSIGNMENT,'=',1,2127) +LexToken(NUMBER,'1',1,2128) +LexToken(EOL,'\n',1,2129) +LexToken(VAR,'model',1,2138) +LexToken(DOT,'.',1,2143) +LexToken(VAR,'rpar',1,2144) +LexToken(ASSIGNMENT,'=',1,2148) +LexToken(OPENSQBRACKET,'[',1,2149) +LexToken(VAR,'P0',1,2150) +LexToken(SEMICOLON,';',1,2152) +LexToken(VAR,'T0',1,2153) +LexToken(SEMICOLON,';',1,2155) +LexToken(VAR,'H0',1,2156) +LexToken(SEMICOLON,';',1,2158) +LexToken(VAR,'option_temperature',1,2159) +LexToken(CLOSESQBRACKET,']',1,2177) +LexToken(EOL,'\n',1,2178) +LexToken(VAR,'model',1,2187) +LexToken(DOT,'.',1,2192) +LexToken(VAR,'sim',1,2193) +LexToken(ASSIGNMENT,'=',1,2196) +LexToken(DQSTRING,'"Puits"',1,2203) +LexToken(EOL,'\n',1,2204) +LexToken(VAR,'model',1,2213) +LexToken(DOT,'.',1,2218) +LexToken(VAR,'blocktype',1,2219) +LexToken(ASSIGNMENT,'=',1,2228) +LexToken(DQSTRING,'"c"',1,2231) +LexToken(EOL,'\n',1,2232) +LexToken(VAR,'model',1,2241) +LexToken(DOT,'.',1,2246) +LexToken(VAR,'dep_ut',1,2247) +LexToken(ASSIGNMENT,'=',1,2253) +LexToken(OPENSQBRACKET,'[',1,2254) +LexToken(PREVAR_BOOLEAN,'%t',1,2255) +LexToken(PREVAR_BOOLEAN,'%f',1,2258) +LexToken(CLOSESQBRACKET,']',1,2260) +LexToken(EOL,'\n',1,2261) +LexToken(EOL,'\n',1,2262) +LexToken(VAR,'mo',1,2271) +LexToken(ASSIGNMENT,'=',1,2273) +LexToken(VAR,'modelica',1,2274) +LexToken(OPENBRACKET,'(',1,2282) +LexToken(CLOSEBRACKET,')',1,2283) +LexToken(EOL,'\n',1,2284) +LexToken(VAR,'mo',1,2293) +LexToken(DOT,'.',1,2295) +LexToken(VAR,'model',1,2296) +LexToken(ASSIGNMENT,'=',1,2301) +LexToken(DQSTRING,'"Puits"',1,2308) +LexToken(EOL,'\n',1,2309) +LexToken(VAR,'mo',1,2318) +LexToken(DOT,'.',1,2320) +LexToken(VAR,'inputs',1,2321) +LexToken(ASSIGNMENT,'=',1,2327) +LexToken(OPENSQBRACKET,'[',1,2328) +LexToken(DQSTRING,'"C"',1,2331) +LexToken(CLOSESQBRACKET,']',1,2332) +LexToken(SEMICOLON,';',1,2333) +LexToken(EOL,'\n',1,2334) +LexToken(VAR,'mo',1,2343) +LexToken(DOT,'.',1,2345) +LexToken(VAR,'parameters',1,2346) +LexToken(ASSIGNMENT,'=',1,2356) +LexToken(VAR,'list',1,2357) +LexToken(OPENBRACKET,'(',1,2361) +LexToken(OPENSQBRACKET,'[',1,2362) +LexToken(DQSTRING,'"P0"',1,2366) LexToken(SEMICOLON,';',1,2367) -LexToken(DQSTRING,'"H0"',1,2371) +LexToken(DQSTRING,'"T0"',1,2371) LexToken(SEMICOLON,';',1,2372) -LexToken(DQSTRING,'"option_temperature"',1,2392) -LexToken(CLOSESQBRACKET,']',1,2393) -LexToken(COMMA,',',1,2394) -LexToken(OPENSQBRACKET,'[',1,2395) -LexToken(VAR,'P0',1,2396) -LexToken(SEMICOLON,';',1,2398) -LexToken(VAR,'T0',1,2399) -LexToken(SEMICOLON,';',1,2401) -LexToken(VAR,'H0',1,2402) -LexToken(SEMICOLON,';',1,2404) -LexToken(VAR,'option_temperature',1,2405) -LexToken(CLOSESQBRACKET,']',1,2423) -LexToken(CLOSEBRACKET,')',1,2424) -LexToken(EOL,'\n',1,2425) -LexToken(VAR,'model',1,2434) -LexToken(DOT,'.',1,2439) -LexToken(VAR,'equations',1,2440) -LexToken(ASSIGNMENT,'=',1,2449) -LexToken(VAR,'mo',1,2450) -LexToken(EOL,'\n',1,2452) -LexToken(VAR,'model',1,2461) -LexToken(DOT,'.',1,2466) -LexToken(VAR,'in',1,2467) -LexToken(ASSIGNMENT,'=',1,2469) -LexToken(VAR,'ones',1,2470) -LexToken(OPENBRACKET,'(',1,2474) -LexToken(VAR,'size',1,2475) +LexToken(DQSTRING,'"H0"',1,2376) +LexToken(SEMICOLON,';',1,2377) +LexToken(DQSTRING,'"option_temperature"',1,2397) +LexToken(CLOSESQBRACKET,']',1,2398) +LexToken(COMMA,',',1,2399) +LexToken(OPENSQBRACKET,'[',1,2400) +LexToken(VAR,'P0',1,2401) +LexToken(SEMICOLON,';',1,2403) +LexToken(VAR,'T0',1,2404) +LexToken(SEMICOLON,';',1,2406) +LexToken(VAR,'H0',1,2407) +LexToken(SEMICOLON,';',1,2409) +LexToken(VAR,'option_temperature',1,2410) +LexToken(CLOSESQBRACKET,']',1,2428) +LexToken(CLOSEBRACKET,')',1,2429) +LexToken(EOL,'\n',1,2430) +LexToken(VAR,'model',1,2439) +LexToken(DOT,'.',1,2444) +LexToken(VAR,'equations',1,2445) +LexToken(ASSIGNMENT,'=',1,2454) +LexToken(VAR,'mo',1,2455) +LexToken(EOL,'\n',1,2457) +LexToken(VAR,'model',1,2466) +LexToken(DOT,'.',1,2471) +LexToken(VAR,'in',1,2472) +LexToken(ASSIGNMENT,'=',1,2474) +LexToken(VAR,'ones',1,2475) LexToken(OPENBRACKET,'(',1,2479) -LexToken(VAR,'mo',1,2480) -LexToken(DOT,'.',1,2482) -LexToken(VAR,'inputs',1,2483) -LexToken(COMMA,',',1,2489) -LexToken(DQSTRING,'"*"',1,2492) -LexToken(CLOSEBRACKET,')',1,2493) +LexToken(VAR,'size',1,2480) +LexToken(OPENBRACKET,'(',1,2484) +LexToken(VAR,'mo',1,2485) +LexToken(DOT,'.',1,2487) +LexToken(VAR,'inputs',1,2488) LexToken(COMMA,',',1,2494) -LexToken(NUMBER,'1',1,2495) -LexToken(CLOSEBRACKET,')',1,2496) -LexToken(EOL,'\n',1,2497) -LexToken(EOL,'\n',1,2546) -LexToken(VAR,'exprs',1,2555) -LexToken(ASSIGNMENT,'=',1,2560) -LexToken(OPENSQBRACKET,'[',1,2561) -LexToken(VAR,'string',1,2562) -LexToken(OPENBRACKET,'(',1,2568) -LexToken(VAR,'P0',1,2569) -LexToken(CLOSEBRACKET,')',1,2571) -LexToken(SEMICOLON,';',1,2572) -LexToken(VAR,'string',1,2573) -LexToken(OPENBRACKET,'(',1,2579) -LexToken(VAR,'T0',1,2580) -LexToken(CLOSEBRACKET,')',1,2582) -LexToken(SEMICOLON,';',1,2583) -LexToken(VAR,'string',1,2584) -LexToken(OPENBRACKET,'(',1,2590) -LexToken(VAR,'H0',1,2591) -LexToken(CLOSEBRACKET,')',1,2593) -LexToken(SEMICOLON,';',1,2594) -LexToken(VAR,'string',1,2595) -LexToken(OPENBRACKET,'(',1,2601) -LexToken(VAR,'option_temperature',1,2602) -LexToken(CLOSEBRACKET,')',1,2620) -LexToken(CLOSESQBRACKET,']',1,2621) -LexToken(EOL,'\n',1,2622) -LexToken(VAR,'gr_i',1,2631) -LexToken(ASSIGNMENT,'=',1,2635) -LexToken(OPENSQBRACKET,'[',1,2636) -LexToken(CLOSESQBRACKET,']',1,2637) -LexToken(SEMICOLON,';',1,2638) -LexToken(EOL,'\n',1,2639) -LexToken(VAR,'x',1,2648) -LexToken(ASSIGNMENT,'=',1,2649) -LexToken(VAR,'standard_define',1,2650) -LexToken(OPENBRACKET,'(',1,2665) -LexToken(OPENSQBRACKET,'[',1,2666) -LexToken(NUMBER,'2.5',1,2667) -LexToken(NUMBER,'2',1,2671) -LexToken(CLOSESQBRACKET,']',1,2672) -LexToken(COMMA,',',1,2673) -LexToken(VAR,'model',1,2674) -LexToken(COMMA,',',1,2679) -LexToken(VAR,'exprs',1,2680) -LexToken(COMMA,',',1,2685) -LexToken(VAR,'list',1,2686) -LexToken(OPENBRACKET,'(',1,2690) -LexToken(VAR,'gr_i',1,2691) -LexToken(COMMA,',',1,2695) -LexToken(NUMBER,'0',1,2696) -LexToken(CLOSEBRACKET,')',1,2697) -LexToken(CLOSEBRACKET,')',1,2698) -LexToken(EOL,'\n',1,2699) -LexToken(EOL,'\n',1,2751) -LexToken(VAR,'x',1,2760) -LexToken(DOT,'.',1,2761) -LexToken(VAR,'graphics',1,2762) -LexToken(DOT,'.',1,2770) -LexToken(VAR,'in_implicit',1,2771) -LexToken(ASSIGNMENT,'=',1,2782) -LexToken(OPENSQBRACKET,'[',1,2783) -LexToken(DQSTRING,'"I"',1,2786) -LexToken(CLOSESQBRACKET,']',1,2787) -LexToken(EOL,'\n',1,2788) -LexToken(EOL,'\n',1,2826) -LexToken(END,'end',1,2831) -LexToken(EOL,'\n',1,2834) -LexToken(ENDFUNCTION,'endfunction',1,2835) -LexToken(EOL,'\n',1,2846) +LexToken(DQSTRING,'"*"',1,2497) +LexToken(CLOSEBRACKET,')',1,2498) +LexToken(COMMA,',',1,2499) +LexToken(NUMBER,'1',1,2500) +LexToken(CLOSEBRACKET,')',1,2501) +LexToken(EOL,'\n',1,2502) +LexToken(EOL,'\n',1,2551) +LexToken(VAR,'exprs',1,2560) +LexToken(ASSIGNMENT,'=',1,2565) +LexToken(OPENSQBRACKET,'[',1,2566) +LexToken(VAR,'string',1,2567) +LexToken(OPENBRACKET,'(',1,2573) +LexToken(VAR,'P0',1,2574) +LexToken(CLOSEBRACKET,')',1,2576) +LexToken(SEMICOLON,';',1,2577) +LexToken(VAR,'string',1,2578) +LexToken(OPENBRACKET,'(',1,2584) +LexToken(VAR,'T0',1,2585) +LexToken(CLOSEBRACKET,')',1,2587) +LexToken(SEMICOLON,';',1,2588) +LexToken(VAR,'string',1,2589) +LexToken(OPENBRACKET,'(',1,2595) +LexToken(VAR,'H0',1,2596) +LexToken(CLOSEBRACKET,')',1,2598) +LexToken(SEMICOLON,';',1,2599) +LexToken(VAR,'string',1,2600) +LexToken(OPENBRACKET,'(',1,2606) +LexToken(VAR,'option_temperature',1,2607) +LexToken(CLOSEBRACKET,')',1,2625) +LexToken(CLOSESQBRACKET,']',1,2626) +LexToken(EOL,'\n',1,2627) +LexToken(VAR,'gr_i',1,2636) +LexToken(ASSIGNMENT,'=',1,2640) +LexToken(OPENSQBRACKET,'[',1,2641) +LexToken(CLOSESQBRACKET,']',1,2642) +LexToken(SEMICOLON,';',1,2643) +LexToken(EOL,'\n',1,2644) +LexToken(VAR,'x',1,2653) +LexToken(ASSIGNMENT,'=',1,2654) +LexToken(VAR,'standard_define',1,2655) +LexToken(OPENBRACKET,'(',1,2670) +LexToken(OPENSQBRACKET,'[',1,2671) +LexToken(NUMBER,'2.5',1,2672) +LexToken(NUMBER,'2',1,2676) +LexToken(CLOSESQBRACKET,']',1,2677) +LexToken(COMMA,',',1,2678) +LexToken(VAR,'model',1,2679) +LexToken(COMMA,',',1,2684) +LexToken(VAR,'exprs',1,2685) +LexToken(COMMA,',',1,2690) +LexToken(VAR,'list',1,2691) +LexToken(OPENBRACKET,'(',1,2695) +LexToken(VAR,'gr_i',1,2696) +LexToken(COMMA,',',1,2700) +LexToken(NUMBER,'0',1,2701) +LexToken(CLOSEBRACKET,')',1,2702) +LexToken(CLOSEBRACKET,')',1,2703) +LexToken(EOL,'\n',1,2704) +LexToken(EOL,'\n',1,2756) +LexToken(VAR,'x',1,2765) +LexToken(DOT,'.',1,2766) +LexToken(VAR,'graphics',1,2767) +LexToken(DOT,'.',1,2775) +LexToken(VAR,'in_implicit',1,2776) +LexToken(ASSIGNMENT,'=',1,2787) +LexToken(OPENSQBRACKET,'[',1,2788) +LexToken(DQSTRING,'"I"',1,2791) +LexToken(CLOSESQBRACKET,']',1,2792) +LexToken(EOL,'\n',1,2793) +LexToken(EOL,'\n',1,2831) +LexToken(END,'end',1,2836) +LexToken(EOL,'\n',1,2839) +LexToken(ENDFUNCTION,'endfunction',1,2840) +LexToken(EOL,'\n',1,2851) diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 4332c1a0..1f4a948d 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -112,330 +112,334 @@ LexToken(CLOSESQBRACKET,']',1,1331) LexToken(ASSIGNMENT,'=',1,1332) LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1333) LexToken(OPENBRACKET,'(',1,1348) -LexToken(DQSTRING,'"Paramètres du puits"',1,1369) -LexToken(COMMA,',',1,1370) -LexToken(OPENSQBRACKET,'[',1,1386) -LexToken(DQSTRING,'"Pression de la source : P0 (Pa)"',1,1419) -LexToken(SEMICOLON,';',1,1420) -LexToken(DQSTRING,'"Temperature de la source : T0 (K)"',1,1470) -LexToken(SEMICOLON,';',1,1471) -LexToken(DQSTRING,'"Enthalpie spécifique de la source : H0 (J/kg)"',1,1533) -LexToken(SEMICOLON,';',1,1534) -LexToken(DQSTRING,'"1:température fixée - 2:enthalpie fixée : option_temperature"',1,1611) -LexToken(CLOSESQBRACKET,']',1,1612) -LexToken(COMMA,',',1,1613) -LexToken(VAR,'list',1,1629) -LexToken(OPENBRACKET,'(',1,1633) -LexToken(DQSTRING,'"vec"',1,1638) -LexToken(COMMA,',',1,1639) -LexToken(NUMBER,'-1',1,1640) -LexToken(COMMA,',',1,1642) -LexToken(DQSTRING,'"vec"',1,1647) -LexToken(COMMA,',',1,1648) -LexToken(NUMBER,'-1',1,1649) -LexToken(COMMA,',',1,1651) -LexToken(DQSTRING,'"vec"',1,1656) -LexToken(COMMA,',',1,1657) -LexToken(NUMBER,'-1',1,1658) -LexToken(COMMA,',',1,1660) -LexToken(DQSTRING,'"vec"',1,1665) -LexToken(COMMA,',',1,1666) -LexToken(NUMBER,'-1',1,1667) -LexToken(CLOSEBRACKET,')',1,1669) -LexToken(COMMA,',',1,1670) -LexToken(VAR,'exprs',1,1671) -LexToken(CLOSEBRACKET,')',1,1676) -LexToken(EOL,'\n',1,1677) -LexToken(IF,'if',1,1690) -LexToken(NOT,'~',1,1693) -LexToken(VAR,'ok',1,1694) -LexToken(THEN,'then',1,1697) -LexToken(EOL,'\n',1,1701) -LexToken(BREAK,'break',1,1718) -LexToken(COMMA,',',1,1723) -LexToken(EOL,'\n',1,1724) -LexToken(END,'end',1,1737) -LexToken(EOL,'\n',1,1740) -LexToken(VAR,'model',1,1753) -LexToken(DOT,'.',1,1758) -LexToken(VAR,'rpar',1,1759) -LexToken(ASSIGNMENT,'=',1,1763) -LexToken(OPENSQBRACKET,'[',1,1764) -LexToken(VAR,'P0',1,1765) -LexToken(SEMICOLON,';',1,1767) -LexToken(VAR,'T0',1,1768) -LexToken(SEMICOLON,';',1,1770) -LexToken(VAR,'H0',1,1771) -LexToken(SEMICOLON,';',1,1773) -LexToken(VAR,'option_temperature',1,1774) -LexToken(CLOSESQBRACKET,']',1,1792) -LexToken(EOL,'\n',1,1793) -LexToken(VAR,'model',1,1806) -LexToken(DOT,'.',1,1811) -LexToken(VAR,'equations',1,1812) -LexToken(DOT,'.',1,1821) -LexToken(VAR,'parameters',1,1822) -LexToken(OPENBRACKET,'(',1,1832) -LexToken(NUMBER,'2',1,1833) -LexToken(CLOSEBRACKET,')',1,1834) -LexToken(ASSIGNMENT,'=',1,1835) -LexToken(VAR,'list',1,1836) -LexToken(OPENBRACKET,'(',1,1840) -LexToken(VAR,'P0',1,1841) -LexToken(COMMA,',',1,1843) -LexToken(VAR,'T0',1,1844) -LexToken(COMMA,',',1,1846) -LexToken(VAR,'H0',1,1847) -LexToken(COMMA,',',1,1849) -LexToken(VAR,'option_temperature',1,1850) -LexToken(CLOSEBRACKET,')',1,1868) -LexToken(EOL,'\n',1,1869) -LexToken(EOL,'\n',1,1950) -LexToken(VAR,'graphics',1,1963) -LexToken(DOT,'.',1,1971) -LexToken(VAR,'exprs',1,1972) -LexToken(ASSIGNMENT,'=',1,1977) -LexToken(VAR,'exprs',1,1978) -LexToken(EOL,'\n',1,1983) -LexToken(VAR,'x',1,1996) -LexToken(DOT,'.',1,1997) -LexToken(VAR,'graphics',1,1998) -LexToken(ASSIGNMENT,'=',1,2006) -LexToken(VAR,'graphics',1,2007) -LexToken(SEMICOLON,';',1,2015) -LexToken(EOL,'\n',1,2016) -LexToken(VAR,'x',1,2029) -LexToken(DOT,'.',1,2030) -LexToken(VAR,'model',1,2031) -LexToken(ASSIGNMENT,'=',1,2036) -LexToken(VAR,'model',1,2037) -LexToken(EOL,'\n',1,2042) -LexToken(BREAK,'break',1,2055) -LexToken(EOL,'\n',1,2060) -LexToken(END,'end',1,2069) -LexToken(EOL,'\n',1,2072) -LexToken(CASE,'case',1,2077) -LexToken(DQSTRING,'"define"',1,2089) -LexToken(THEN,'then',1,2091) -LexToken(EOL,'\n',1,2095) -LexToken(VAR,'model',1,2104) -LexToken(ASSIGNMENT,'=',1,2109) -LexToken(SCICOS_MODEL,'scicos_model',1,2110) -LexToken(OPENBRACKET,'(',1,2122) -LexToken(CLOSEBRACKET,')',1,2123) -LexToken(EOL,'\n',1,2124) -LexToken(VAR,'P0',1,2133) -LexToken(ASSIGNMENT,'=',1,2135) -LexToken(NUMBER,'300000',1,2136) -LexToken(EOL,'\n',1,2142) -LexToken(VAR,'T0',1,2151) -LexToken(ASSIGNMENT,'=',1,2153) -LexToken(NUMBER,'290',1,2154) -LexToken(EOL,'\n',1,2157) -LexToken(VAR,'H0',1,2166) -LexToken(ASSIGNMENT,'=',1,2168) -LexToken(NUMBER,'100000',1,2169) -LexToken(EOL,'\n',1,2175) -LexToken(VAR,'option_temperature',1,2184) -LexToken(ASSIGNMENT,'=',1,2202) -LexToken(NUMBER,'1',1,2203) -LexToken(EOL,'\n',1,2204) -LexToken(VAR,'model',1,2213) -LexToken(DOT,'.',1,2218) -LexToken(VAR,'rpar',1,2219) -LexToken(ASSIGNMENT,'=',1,2223) -LexToken(OPENSQBRACKET,'[',1,2224) -LexToken(VAR,'P0',1,2225) -LexToken(SEMICOLON,';',1,2227) -LexToken(VAR,'T0',1,2228) -LexToken(SEMICOLON,';',1,2230) -LexToken(VAR,'H0',1,2231) -LexToken(SEMICOLON,';',1,2233) -LexToken(VAR,'option_temperature',1,2234) -LexToken(CLOSESQBRACKET,']',1,2252) -LexToken(EOL,'\n',1,2253) -LexToken(VAR,'model',1,2262) -LexToken(DOT,'.',1,2267) -LexToken(VAR,'sim',1,2268) -LexToken(ASSIGNMENT,'=',1,2271) -LexToken(DQSTRING,'"Source"',1,2279) -LexToken(EOL,'\n',1,2280) -LexToken(VAR,'model',1,2289) -LexToken(DOT,'.',1,2294) -LexToken(VAR,'blocktype',1,2295) -LexToken(ASSIGNMENT,'=',1,2304) -LexToken(DQSTRING,'"c"',1,2307) -LexToken(EOL,'\n',1,2308) -LexToken(VAR,'model',1,2317) -LexToken(DOT,'.',1,2322) -LexToken(VAR,'dep_ut',1,2323) -LexToken(ASSIGNMENT,'=',1,2329) -LexToken(OPENSQBRACKET,'[',1,2330) -LexToken(PREVAR_BOOLEAN,'%t',1,2331) -LexToken(PREVAR_BOOLEAN,'%f',1,2334) -LexToken(CLOSESQBRACKET,']',1,2336) -LexToken(EOL,'\n',1,2337) -LexToken(EOL,'\n',1,2338) -LexToken(VAR,'mo',1,2347) -LexToken(ASSIGNMENT,'=',1,2349) -LexToken(VAR,'modelica',1,2350) -LexToken(OPENBRACKET,'(',1,2358) -LexToken(CLOSEBRACKET,')',1,2359) -LexToken(EOL,'\n',1,2360) -LexToken(VAR,'mo',1,2369) -LexToken(DOT,'.',1,2371) -LexToken(VAR,'model',1,2372) -LexToken(ASSIGNMENT,'=',1,2377) -LexToken(DQSTRING,'"Source"',1,2385) -LexToken(EOL,'\n',1,2386) -LexToken(VAR,'mo',1,2395) -LexToken(DOT,'.',1,2397) -LexToken(VAR,'inputs',1,2398) -LexToken(ASSIGNMENT,'=',1,2404) -LexToken(OPENSQBRACKET,'[',1,2405) -LexToken(CLOSESQBRACKET,']',1,2406) -LexToken(SEMICOLON,';',1,2407) -LexToken(EOL,'\n',1,2408) -LexToken(VAR,'mo',1,2417) -LexToken(DOT,'.',1,2419) -LexToken(VAR,'outputs',1,2420) -LexToken(ASSIGNMENT,'=',1,2427) -LexToken(OPENSQBRACKET,'[',1,2428) -LexToken(DQSTRING,'"C"',1,2431) -LexToken(CLOSESQBRACKET,']',1,2432) -LexToken(SEMICOLON,';',1,2433) -LexToken(EOL,'\n',1,2434) -LexToken(VAR,'mo',1,2443) -LexToken(DOT,'.',1,2445) -LexToken(VAR,'parameters',1,2446) -LexToken(ASSIGNMENT,'=',1,2456) -LexToken(VAR,'list',1,2457) -LexToken(OPENBRACKET,'(',1,2461) -LexToken(OPENSQBRACKET,'[',1,2462) -LexToken(DQSTRING,'"P0"',1,2466) -LexToken(SEMICOLON,';',1,2467) -LexToken(DQSTRING,'"T0"',1,2471) +LexToken(DQSTRING,'"Param\xc3\xa8tres du puits"',1,1370) +LexToken(COMMA,',',1,1371) +LexToken(OPENSQBRACKET,'[',1,1387) +LexToken(DQSTRING,'"Pression de la source : P0 (Pa)"',1,1420) +LexToken(SEMICOLON,';',1,1421) +LexToken(DQSTRING,'"Temperature de la source : T0 (K)"',1,1471) +LexToken(SEMICOLON,';',1,1472) +LexToken(DQSTRING,'"Enthalpie sp\xc3\xa9cifique de la source : H0 (J/kg)"',1,1535) +LexToken(SEMICOLON,';',1,1536) +LexToken(DQSTRING,'"1:temp\xc3\xa9rature fix\xc3\xa9e - 2:enthalpie fix\xc3\xa9e : option_temperature"',1,1616) +LexToken(CLOSESQBRACKET,']',1,1617) +LexToken(COMMA,',',1,1618) +LexToken(VAR,'list',1,1634) +LexToken(OPENBRACKET,'(',1,1638) +LexToken(DQSTRING,'"vec"',1,1643) +LexToken(COMMA,',',1,1644) +LexToken(ADDITION,'-',1,1645) +LexToken(NUMBER,'1',1,1646) +LexToken(COMMA,',',1,1647) +LexToken(DQSTRING,'"vec"',1,1652) +LexToken(COMMA,',',1,1653) +LexToken(ADDITION,'-',1,1654) +LexToken(NUMBER,'1',1,1655) +LexToken(COMMA,',',1,1656) +LexToken(DQSTRING,'"vec"',1,1661) +LexToken(COMMA,',',1,1662) +LexToken(ADDITION,'-',1,1663) +LexToken(NUMBER,'1',1,1664) +LexToken(COMMA,',',1,1665) +LexToken(DQSTRING,'"vec"',1,1670) +LexToken(COMMA,',',1,1671) +LexToken(ADDITION,'-',1,1672) +LexToken(NUMBER,'1',1,1673) +LexToken(CLOSEBRACKET,')',1,1674) +LexToken(COMMA,',',1,1675) +LexToken(VAR,'exprs',1,1676) +LexToken(CLOSEBRACKET,')',1,1681) +LexToken(EOL,'\n',1,1682) +LexToken(IF,'if',1,1695) +LexToken(NOT,'~',1,1698) +LexToken(VAR,'ok',1,1699) +LexToken(THEN,'then',1,1702) +LexToken(EOL,'\n',1,1706) +LexToken(BREAK,'break',1,1723) +LexToken(COMMA,',',1,1728) +LexToken(EOL,'\n',1,1729) +LexToken(END,'end',1,1742) +LexToken(EOL,'\n',1,1745) +LexToken(VAR,'model',1,1758) +LexToken(DOT,'.',1,1763) +LexToken(VAR,'rpar',1,1764) +LexToken(ASSIGNMENT,'=',1,1768) +LexToken(OPENSQBRACKET,'[',1,1769) +LexToken(VAR,'P0',1,1770) +LexToken(SEMICOLON,';',1,1772) +LexToken(VAR,'T0',1,1773) +LexToken(SEMICOLON,';',1,1775) +LexToken(VAR,'H0',1,1776) +LexToken(SEMICOLON,';',1,1778) +LexToken(VAR,'option_temperature',1,1779) +LexToken(CLOSESQBRACKET,']',1,1797) +LexToken(EOL,'\n',1,1798) +LexToken(VAR,'model',1,1811) +LexToken(DOT,'.',1,1816) +LexToken(VAR,'equations',1,1817) +LexToken(DOT,'.',1,1826) +LexToken(VAR,'parameters',1,1827) +LexToken(OPENBRACKET,'(',1,1837) +LexToken(NUMBER,'2',1,1838) +LexToken(CLOSEBRACKET,')',1,1839) +LexToken(ASSIGNMENT,'=',1,1840) +LexToken(VAR,'list',1,1841) +LexToken(OPENBRACKET,'(',1,1845) +LexToken(VAR,'P0',1,1846) +LexToken(COMMA,',',1,1848) +LexToken(VAR,'T0',1,1849) +LexToken(COMMA,',',1,1851) +LexToken(VAR,'H0',1,1852) +LexToken(COMMA,',',1,1854) +LexToken(VAR,'option_temperature',1,1855) +LexToken(CLOSEBRACKET,')',1,1873) +LexToken(EOL,'\n',1,1874) +LexToken(EOL,'\n',1,1955) +LexToken(VAR,'graphics',1,1968) +LexToken(DOT,'.',1,1976) +LexToken(VAR,'exprs',1,1977) +LexToken(ASSIGNMENT,'=',1,1982) +LexToken(VAR,'exprs',1,1983) +LexToken(EOL,'\n',1,1988) +LexToken(VAR,'x',1,2001) +LexToken(DOT,'.',1,2002) +LexToken(VAR,'graphics',1,2003) +LexToken(ASSIGNMENT,'=',1,2011) +LexToken(VAR,'graphics',1,2012) +LexToken(SEMICOLON,';',1,2020) +LexToken(EOL,'\n',1,2021) +LexToken(VAR,'x',1,2034) +LexToken(DOT,'.',1,2035) +LexToken(VAR,'model',1,2036) +LexToken(ASSIGNMENT,'=',1,2041) +LexToken(VAR,'model',1,2042) +LexToken(EOL,'\n',1,2047) +LexToken(BREAK,'break',1,2060) +LexToken(EOL,'\n',1,2065) +LexToken(END,'end',1,2074) +LexToken(EOL,'\n',1,2077) +LexToken(CASE,'case',1,2082) +LexToken(DQSTRING,'"define"',1,2094) +LexToken(THEN,'then',1,2096) +LexToken(EOL,'\n',1,2100) +LexToken(VAR,'model',1,2109) +LexToken(ASSIGNMENT,'=',1,2114) +LexToken(SCICOS_MODEL,'scicos_model',1,2115) +LexToken(OPENBRACKET,'(',1,2127) +LexToken(CLOSEBRACKET,')',1,2128) +LexToken(EOL,'\n',1,2129) +LexToken(VAR,'P0',1,2138) +LexToken(ASSIGNMENT,'=',1,2140) +LexToken(NUMBER,'300000',1,2141) +LexToken(EOL,'\n',1,2147) +LexToken(VAR,'T0',1,2156) +LexToken(ASSIGNMENT,'=',1,2158) +LexToken(NUMBER,'290',1,2159) +LexToken(EOL,'\n',1,2162) +LexToken(VAR,'H0',1,2171) +LexToken(ASSIGNMENT,'=',1,2173) +LexToken(NUMBER,'100000',1,2174) +LexToken(EOL,'\n',1,2180) +LexToken(VAR,'option_temperature',1,2189) +LexToken(ASSIGNMENT,'=',1,2207) +LexToken(NUMBER,'1',1,2208) +LexToken(EOL,'\n',1,2209) +LexToken(VAR,'model',1,2218) +LexToken(DOT,'.',1,2223) +LexToken(VAR,'rpar',1,2224) +LexToken(ASSIGNMENT,'=',1,2228) +LexToken(OPENSQBRACKET,'[',1,2229) +LexToken(VAR,'P0',1,2230) +LexToken(SEMICOLON,';',1,2232) +LexToken(VAR,'T0',1,2233) +LexToken(SEMICOLON,';',1,2235) +LexToken(VAR,'H0',1,2236) +LexToken(SEMICOLON,';',1,2238) +LexToken(VAR,'option_temperature',1,2239) +LexToken(CLOSESQBRACKET,']',1,2257) +LexToken(EOL,'\n',1,2258) +LexToken(VAR,'model',1,2267) +LexToken(DOT,'.',1,2272) +LexToken(VAR,'sim',1,2273) +LexToken(ASSIGNMENT,'=',1,2276) +LexToken(DQSTRING,'"Source"',1,2284) +LexToken(EOL,'\n',1,2285) +LexToken(VAR,'model',1,2294) +LexToken(DOT,'.',1,2299) +LexToken(VAR,'blocktype',1,2300) +LexToken(ASSIGNMENT,'=',1,2309) +LexToken(DQSTRING,'"c"',1,2312) +LexToken(EOL,'\n',1,2313) +LexToken(VAR,'model',1,2322) +LexToken(DOT,'.',1,2327) +LexToken(VAR,'dep_ut',1,2328) +LexToken(ASSIGNMENT,'=',1,2334) +LexToken(OPENSQBRACKET,'[',1,2335) +LexToken(PREVAR_BOOLEAN,'%t',1,2336) +LexToken(PREVAR_BOOLEAN,'%f',1,2339) +LexToken(CLOSESQBRACKET,']',1,2341) +LexToken(EOL,'\n',1,2342) +LexToken(EOL,'\n',1,2343) +LexToken(VAR,'mo',1,2352) +LexToken(ASSIGNMENT,'=',1,2354) +LexToken(VAR,'modelica',1,2355) +LexToken(OPENBRACKET,'(',1,2363) +LexToken(CLOSEBRACKET,')',1,2364) +LexToken(EOL,'\n',1,2365) +LexToken(VAR,'mo',1,2374) +LexToken(DOT,'.',1,2376) +LexToken(VAR,'model',1,2377) +LexToken(ASSIGNMENT,'=',1,2382) +LexToken(DQSTRING,'"Source"',1,2390) +LexToken(EOL,'\n',1,2391) +LexToken(VAR,'mo',1,2400) +LexToken(DOT,'.',1,2402) +LexToken(VAR,'inputs',1,2403) +LexToken(ASSIGNMENT,'=',1,2409) +LexToken(OPENSQBRACKET,'[',1,2410) +LexToken(CLOSESQBRACKET,']',1,2411) +LexToken(SEMICOLON,';',1,2412) +LexToken(EOL,'\n',1,2413) +LexToken(VAR,'mo',1,2422) +LexToken(DOT,'.',1,2424) +LexToken(VAR,'outputs',1,2425) +LexToken(ASSIGNMENT,'=',1,2432) +LexToken(OPENSQBRACKET,'[',1,2433) +LexToken(DQSTRING,'"C"',1,2436) +LexToken(CLOSESQBRACKET,']',1,2437) +LexToken(SEMICOLON,';',1,2438) +LexToken(EOL,'\n',1,2439) +LexToken(VAR,'mo',1,2448) +LexToken(DOT,'.',1,2450) +LexToken(VAR,'parameters',1,2451) +LexToken(ASSIGNMENT,'=',1,2461) +LexToken(VAR,'list',1,2462) +LexToken(OPENBRACKET,'(',1,2466) +LexToken(OPENSQBRACKET,'[',1,2467) +LexToken(DQSTRING,'"P0"',1,2471) LexToken(SEMICOLON,';',1,2472) -LexToken(DQSTRING,'"H0"',1,2476) +LexToken(DQSTRING,'"T0"',1,2476) LexToken(SEMICOLON,';',1,2477) -LexToken(DQSTRING,'"option_temperature"',1,2497) -LexToken(CLOSESQBRACKET,']',1,2498) -LexToken(COMMA,',',1,2499) -LexToken(OPENSQBRACKET,'[',1,2500) -LexToken(VAR,'P0',1,2501) -LexToken(SEMICOLON,';',1,2503) -LexToken(VAR,'T0',1,2504) -LexToken(SEMICOLON,';',1,2506) -LexToken(VAR,'H0',1,2507) -LexToken(SEMICOLON,';',1,2509) -LexToken(VAR,'option_temperature',1,2510) -LexToken(CLOSESQBRACKET,']',1,2528) -LexToken(CLOSEBRACKET,')',1,2529) -LexToken(EOL,'\n',1,2530) -LexToken(VAR,'model',1,2539) -LexToken(DOT,'.',1,2544) -LexToken(VAR,'equations',1,2545) -LexToken(ASSIGNMENT,'=',1,2554) -LexToken(VAR,'mo',1,2555) -LexToken(EOL,'\n',1,2557) -LexToken(VAR,'model',1,2566) -LexToken(DOT,'.',1,2571) -LexToken(VAR,'in',1,2572) -LexToken(ASSIGNMENT,'=',1,2574) -LexToken(VAR,'ones',1,2575) -LexToken(OPENBRACKET,'(',1,2579) -LexToken(VAR,'size',1,2580) +LexToken(DQSTRING,'"H0"',1,2481) +LexToken(SEMICOLON,';',1,2482) +LexToken(DQSTRING,'"option_temperature"',1,2502) +LexToken(CLOSESQBRACKET,']',1,2503) +LexToken(COMMA,',',1,2504) +LexToken(OPENSQBRACKET,'[',1,2505) +LexToken(VAR,'P0',1,2506) +LexToken(SEMICOLON,';',1,2508) +LexToken(VAR,'T0',1,2509) +LexToken(SEMICOLON,';',1,2511) +LexToken(VAR,'H0',1,2512) +LexToken(SEMICOLON,';',1,2514) +LexToken(VAR,'option_temperature',1,2515) +LexToken(CLOSESQBRACKET,']',1,2533) +LexToken(CLOSEBRACKET,')',1,2534) +LexToken(EOL,'\n',1,2535) +LexToken(VAR,'model',1,2544) +LexToken(DOT,'.',1,2549) +LexToken(VAR,'equations',1,2550) +LexToken(ASSIGNMENT,'=',1,2559) +LexToken(VAR,'mo',1,2560) +LexToken(EOL,'\n',1,2562) +LexToken(VAR,'model',1,2571) +LexToken(DOT,'.',1,2576) +LexToken(VAR,'in',1,2577) +LexToken(ASSIGNMENT,'=',1,2579) +LexToken(VAR,'ones',1,2580) LexToken(OPENBRACKET,'(',1,2584) -LexToken(VAR,'mo',1,2585) -LexToken(DOT,'.',1,2587) -LexToken(VAR,'inputs',1,2588) -LexToken(COMMA,',',1,2594) -LexToken(DQSTRING,'"*"',1,2597) -LexToken(CLOSEBRACKET,')',1,2598) +LexToken(VAR,'size',1,2585) +LexToken(OPENBRACKET,'(',1,2589) +LexToken(VAR,'mo',1,2590) +LexToken(DOT,'.',1,2592) +LexToken(VAR,'inputs',1,2593) LexToken(COMMA,',',1,2599) -LexToken(NUMBER,'1',1,2600) -LexToken(CLOSEBRACKET,')',1,2601) -LexToken(EOL,'\n',1,2602) -LexToken(VAR,'model',1,2611) -LexToken(DOT,'.',1,2616) -LexToken(VAR,'out',1,2617) -LexToken(ASSIGNMENT,'=',1,2620) -LexToken(VAR,'ones',1,2621) -LexToken(OPENBRACKET,'(',1,2625) -LexToken(VAR,'size',1,2626) +LexToken(DQSTRING,'"*"',1,2602) +LexToken(CLOSEBRACKET,')',1,2603) +LexToken(COMMA,',',1,2604) +LexToken(NUMBER,'1',1,2605) +LexToken(CLOSEBRACKET,')',1,2606) +LexToken(EOL,'\n',1,2607) +LexToken(VAR,'model',1,2616) +LexToken(DOT,'.',1,2621) +LexToken(VAR,'out',1,2622) +LexToken(ASSIGNMENT,'=',1,2625) +LexToken(VAR,'ones',1,2626) LexToken(OPENBRACKET,'(',1,2630) -LexToken(VAR,'mo',1,2631) -LexToken(DOT,'.',1,2633) -LexToken(VAR,'outputs',1,2634) -LexToken(COMMA,',',1,2641) -LexToken(DQSTRING,'"*"',1,2644) -LexToken(CLOSEBRACKET,')',1,2645) +LexToken(VAR,'size',1,2631) +LexToken(OPENBRACKET,'(',1,2635) +LexToken(VAR,'mo',1,2636) +LexToken(DOT,'.',1,2638) +LexToken(VAR,'outputs',1,2639) LexToken(COMMA,',',1,2646) -LexToken(NUMBER,'1',1,2647) -LexToken(CLOSEBRACKET,')',1,2648) -LexToken(EOL,'\n',1,2649) -LexToken(VAR,'exprs',1,2658) -LexToken(ASSIGNMENT,'=',1,2663) -LexToken(OPENSQBRACKET,'[',1,2664) -LexToken(VAR,'string',1,2665) -LexToken(OPENBRACKET,'(',1,2671) -LexToken(VAR,'P0',1,2672) -LexToken(CLOSEBRACKET,')',1,2674) -LexToken(SEMICOLON,';',1,2675) -LexToken(VAR,'string',1,2676) -LexToken(OPENBRACKET,'(',1,2682) -LexToken(VAR,'T0',1,2683) -LexToken(CLOSEBRACKET,')',1,2685) -LexToken(SEMICOLON,';',1,2686) -LexToken(VAR,'string',1,2687) -LexToken(OPENBRACKET,'(',1,2693) -LexToken(VAR,'H0',1,2694) -LexToken(CLOSEBRACKET,')',1,2696) -LexToken(SEMICOLON,';',1,2697) -LexToken(VAR,'string',1,2698) -LexToken(OPENBRACKET,'(',1,2704) -LexToken(VAR,'option_temperature',1,2705) -LexToken(CLOSEBRACKET,')',1,2723) -LexToken(CLOSESQBRACKET,']',1,2724) -LexToken(EOL,'\n',1,2725) -LexToken(VAR,'gr_i',1,2734) -LexToken(ASSIGNMENT,'=',1,2738) -LexToken(OPENSQBRACKET,'[',1,2739) -LexToken(CLOSESQBRACKET,']',1,2740) -LexToken(SEMICOLON,';',1,2741) -LexToken(EOL,'\n',1,2742) -LexToken(VAR,'x',1,2751) -LexToken(ASSIGNMENT,'=',1,2752) -LexToken(VAR,'standard_define',1,2753) -LexToken(OPENBRACKET,'(',1,2768) -LexToken(OPENSQBRACKET,'[',1,2769) -LexToken(NUMBER,'2.5',1,2770) -LexToken(NUMBER,'2',1,2774) -LexToken(CLOSESQBRACKET,']',1,2775) -LexToken(COMMA,',',1,2776) -LexToken(VAR,'model',1,2777) -LexToken(COMMA,',',1,2782) -LexToken(VAR,'exprs',1,2783) -LexToken(COMMA,',',1,2788) -LexToken(VAR,'list',1,2789) -LexToken(OPENBRACKET,'(',1,2793) -LexToken(VAR,'gr_i',1,2794) -LexToken(COMMA,',',1,2798) -LexToken(NUMBER,'0',1,2799) -LexToken(CLOSEBRACKET,')',1,2800) -LexToken(CLOSEBRACKET,')',1,2801) -LexToken(EOL,'\n',1,2802) -LexToken(VAR,'x',1,2811) -LexToken(DOT,'.',1,2812) -LexToken(VAR,'graphics',1,2813) -LexToken(DOT,'.',1,2821) -LexToken(VAR,'out_implicit',1,2822) -LexToken(ASSIGNMENT,'=',1,2834) -LexToken(OPENSQBRACKET,'[',1,2835) -LexToken(DQSTRING,'"I"',1,2838) -LexToken(CLOSESQBRACKET,']',1,2839) -LexToken(EOL,'\n',1,2840) -LexToken(END,'end',1,2845) -LexToken(EOL,'\n',1,2848) -LexToken(ENDFUNCTION,'endfunction',1,2849) -LexToken(EOL,'\n',1,2860) +LexToken(DQSTRING,'"*"',1,2649) +LexToken(CLOSEBRACKET,')',1,2650) +LexToken(COMMA,',',1,2651) +LexToken(NUMBER,'1',1,2652) +LexToken(CLOSEBRACKET,')',1,2653) +LexToken(EOL,'\n',1,2654) +LexToken(VAR,'exprs',1,2663) +LexToken(ASSIGNMENT,'=',1,2668) +LexToken(OPENSQBRACKET,'[',1,2669) +LexToken(VAR,'string',1,2670) +LexToken(OPENBRACKET,'(',1,2676) +LexToken(VAR,'P0',1,2677) +LexToken(CLOSEBRACKET,')',1,2679) +LexToken(SEMICOLON,';',1,2680) +LexToken(VAR,'string',1,2681) +LexToken(OPENBRACKET,'(',1,2687) +LexToken(VAR,'T0',1,2688) +LexToken(CLOSEBRACKET,')',1,2690) +LexToken(SEMICOLON,';',1,2691) +LexToken(VAR,'string',1,2692) +LexToken(OPENBRACKET,'(',1,2698) +LexToken(VAR,'H0',1,2699) +LexToken(CLOSEBRACKET,')',1,2701) +LexToken(SEMICOLON,';',1,2702) +LexToken(VAR,'string',1,2703) +LexToken(OPENBRACKET,'(',1,2709) +LexToken(VAR,'option_temperature',1,2710) +LexToken(CLOSEBRACKET,')',1,2728) +LexToken(CLOSESQBRACKET,']',1,2729) +LexToken(EOL,'\n',1,2730) +LexToken(VAR,'gr_i',1,2739) +LexToken(ASSIGNMENT,'=',1,2743) +LexToken(OPENSQBRACKET,'[',1,2744) +LexToken(CLOSESQBRACKET,']',1,2745) +LexToken(SEMICOLON,';',1,2746) +LexToken(EOL,'\n',1,2747) +LexToken(VAR,'x',1,2756) +LexToken(ASSIGNMENT,'=',1,2757) +LexToken(VAR,'standard_define',1,2758) +LexToken(OPENBRACKET,'(',1,2773) +LexToken(OPENSQBRACKET,'[',1,2774) +LexToken(NUMBER,'2.5',1,2775) +LexToken(NUMBER,'2',1,2779) +LexToken(CLOSESQBRACKET,']',1,2780) +LexToken(COMMA,',',1,2781) +LexToken(VAR,'model',1,2782) +LexToken(COMMA,',',1,2787) +LexToken(VAR,'exprs',1,2788) +LexToken(COMMA,',',1,2793) +LexToken(VAR,'list',1,2794) +LexToken(OPENBRACKET,'(',1,2798) +LexToken(VAR,'gr_i',1,2799) +LexToken(COMMA,',',1,2803) +LexToken(NUMBER,'0',1,2804) +LexToken(CLOSEBRACKET,')',1,2805) +LexToken(CLOSEBRACKET,')',1,2806) +LexToken(EOL,'\n',1,2807) +LexToken(VAR,'x',1,2816) +LexToken(DOT,'.',1,2817) +LexToken(VAR,'graphics',1,2818) +LexToken(DOT,'.',1,2826) +LexToken(VAR,'out_implicit',1,2827) +LexToken(ASSIGNMENT,'=',1,2839) +LexToken(OPENSQBRACKET,'[',1,2840) +LexToken(DQSTRING,'"I"',1,2843) +LexToken(CLOSESQBRACKET,']',1,2844) +LexToken(EOL,'\n',1,2845) +LexToken(END,'end',1,2850) +LexToken(EOL,'\n',1,2853) +LexToken(ENDFUNCTION,'endfunction',1,2854) +LexToken(EOL,'\n',1,2865) diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 15e5248a..b564279a 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -108,312 +108,314 @@ LexToken(CLOSESQBRACKET,']',1,1321) LexToken(ASSIGNMENT,'=',1,1322) LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,1323) LexToken(OPENBRACKET,'(',1,1338) -LexToken(DQSTRING,'"Paramètres de la vanne reglante"',1,1371) -LexToken(COMMA,',',1,1372) -LexToken(OPENSQBRACKET,'[',1,1388) -LexToken(DQSTRING,'"Cvmax"',1,1395) -LexToken(SEMICOLON,';',1,1396) -LexToken(DQSTRING,'"p_rho"',1,1403) -LexToken(CLOSESQBRACKET,']',1,1404) -LexToken(COMMA,',',1,1405) -LexToken(VAR,'list',1,1421) -LexToken(OPENBRACKET,'(',1,1425) -LexToken(DQSTRING,'"vec"',1,1430) -LexToken(COMMA,',',1,1431) -LexToken(NUMBER,'-1',1,1432) -LexToken(COMMA,',',1,1434) -LexToken(DQSTRING,'"vec"',1,1439) -LexToken(COMMA,',',1,1440) -LexToken(NUMBER,'-1',1,1441) -LexToken(CLOSEBRACKET,')',1,1443) -LexToken(COMMA,',',1,1444) -LexToken(VAR,'exprs',1,1445) -LexToken(CLOSEBRACKET,')',1,1450) -LexToken(EOL,'\n',1,1451) -LexToken(IF,'if',1,1464) -LexToken(NOT,'~',1,1467) -LexToken(VAR,'ok',1,1468) -LexToken(THEN,'then',1,1471) -LexToken(EOL,'\n',1,1475) -LexToken(BREAK,'break',1,1492) -LexToken(COMMA,',',1,1497) -LexToken(EOL,'\n',1,1498) -LexToken(END,'end',1,1511) -LexToken(EOL,'\n',1,1514) -LexToken(VAR,'model',1,1527) -LexToken(DOT,'.',1,1532) -LexToken(VAR,'rpar',1,1533) -LexToken(ASSIGNMENT,'=',1,1537) -LexToken(OPENSQBRACKET,'[',1,1538) -LexToken(VAR,'Cvmax',1,1539) -LexToken(SEMICOLON,';',1,1544) -LexToken(VAR,'p_rho',1,1545) -LexToken(CLOSESQBRACKET,']',1,1550) -LexToken(EOL,'\n',1,1551) -LexToken(VAR,'model',1,1564) -LexToken(DOT,'.',1,1569) -LexToken(VAR,'equations',1,1570) -LexToken(DOT,'.',1,1579) -LexToken(VAR,'parameters',1,1580) -LexToken(OPENBRACKET,'(',1,1590) -LexToken(NUMBER,'2',1,1591) -LexToken(CLOSEBRACKET,')',1,1592) -LexToken(ASSIGNMENT,'=',1,1593) -LexToken(VAR,'list',1,1594) -LexToken(OPENBRACKET,'(',1,1598) -LexToken(VAR,'Cvmax',1,1599) -LexToken(COMMA,',',1,1604) -LexToken(VAR,'p_rho',1,1605) -LexToken(CLOSEBRACKET,')',1,1610) -LexToken(EOL,'\n',1,1611) -LexToken(EOL,'\n',1,1676) -LexToken(VAR,'graphics',1,1689) -LexToken(DOT,'.',1,1697) -LexToken(VAR,'exprs',1,1698) -LexToken(ASSIGNMENT,'=',1,1703) -LexToken(VAR,'exprs',1,1704) -LexToken(EOL,'\n',1,1709) -LexToken(VAR,'x',1,1722) -LexToken(DOT,'.',1,1723) -LexToken(VAR,'graphics',1,1724) -LexToken(ASSIGNMENT,'=',1,1732) -LexToken(VAR,'graphics',1,1733) -LexToken(SEMICOLON,';',1,1741) -LexToken(EOL,'\n',1,1742) -LexToken(VAR,'x',1,1755) -LexToken(DOT,'.',1,1756) -LexToken(VAR,'model',1,1757) -LexToken(ASSIGNMENT,'=',1,1762) -LexToken(VAR,'model',1,1763) -LexToken(EOL,'\n',1,1768) -LexToken(BREAK,'break',1,1781) -LexToken(EOL,'\n',1,1786) -LexToken(END,'end',1,1795) -LexToken(EOL,'\n',1,1798) -LexToken(CASE,'case',1,1803) -LexToken(DQSTRING,'"define"',1,1815) -LexToken(THEN,'then',1,1817) -LexToken(EOL,'\n',1,1821) -LexToken(VAR,'model',1,1830) -LexToken(ASSIGNMENT,'=',1,1835) -LexToken(SCICOS_MODEL,'scicos_model',1,1836) -LexToken(OPENBRACKET,'(',1,1848) -LexToken(CLOSEBRACKET,')',1,1849) -LexToken(EOL,'\n',1,1850) -LexToken(VAR,'model',1,1859) -LexToken(DOT,'.',1,1864) -LexToken(VAR,'in',1,1865) -LexToken(ASSIGNMENT,'=',1,1867) -LexToken(OPENSQBRACKET,'[',1,1868) -LexToken(NUMBER,'1',1,1869) -LexToken(SEMICOLON,';',1,1870) -LexToken(NUMBER,'1',1,1871) -LexToken(CLOSESQBRACKET,']',1,1872) -LexToken(SEMICOLON,';',1,1873) -LexToken(EOL,'\n',1,1874) -LexToken(VAR,'model',1,1883) -LexToken(DOT,'.',1,1888) -LexToken(VAR,'out',1,1889) -LexToken(ASSIGNMENT,'=',1,1892) -LexToken(OPENSQBRACKET,'[',1,1893) -LexToken(NUMBER,'1',1,1894) -LexToken(CLOSESQBRACKET,']',1,1895) -LexToken(SEMICOLON,';',1,1896) -LexToken(EOL,'\n',1,1897) -LexToken(VAR,'Cvmax',1,1906) -LexToken(ASSIGNMENT,'=',1,1911) -LexToken(NUMBER,'8005.42',1,1912) -LexToken(EOL,'\n',1,1919) -LexToken(VAR,'p_rho',1,1928) -LexToken(ASSIGNMENT,'=',1,1933) -LexToken(NUMBER,'0',1,1934) -LexToken(EOL,'\n',1,1935) -LexToken(VAR,'model',1,1944) -LexToken(DOT,'.',1,1949) -LexToken(VAR,'rpar',1,1950) -LexToken(ASSIGNMENT,'=',1,1954) -LexToken(OPENSQBRACKET,'[',1,1955) -LexToken(VAR,'Cvmax',1,1956) -LexToken(SEMICOLON,';',1,1961) -LexToken(VAR,'p_rho',1,1962) -LexToken(CLOSESQBRACKET,']',1,1967) -LexToken(EOL,'\n',1,1968) -LexToken(VAR,'model',1,1977) -LexToken(DOT,'.',1,1982) -LexToken(VAR,'sim',1,1983) -LexToken(ASSIGNMENT,'=',1,1986) -LexToken(DQSTRING,'"VanneReglante"',1,2001) -LexToken(EOL,'\n',1,2002) -LexToken(VAR,'model',1,2011) -LexToken(DOT,'.',1,2016) -LexToken(VAR,'blocktype',1,2017) -LexToken(ASSIGNMENT,'=',1,2026) -LexToken(DQSTRING,'"c"',1,2029) -LexToken(EOL,'\n',1,2030) -LexToken(VAR,'model',1,2039) -LexToken(DOT,'.',1,2044) -LexToken(VAR,'dep_ut',1,2045) -LexToken(ASSIGNMENT,'=',1,2051) -LexToken(OPENSQBRACKET,'[',1,2052) -LexToken(PREVAR_BOOLEAN,'%t',1,2053) -LexToken(PREVAR_BOOLEAN,'%f',1,2056) -LexToken(CLOSESQBRACKET,']',1,2058) -LexToken(EOL,'\n',1,2059) +LexToken(DQSTRING,'"Param\xc3\xa8tres de la vanne reglante"',1,1372) +LexToken(COMMA,',',1,1373) +LexToken(OPENSQBRACKET,'[',1,1389) +LexToken(DQSTRING,'"Cvmax"',1,1396) +LexToken(SEMICOLON,';',1,1397) +LexToken(DQSTRING,'"p_rho"',1,1404) +LexToken(CLOSESQBRACKET,']',1,1405) +LexToken(COMMA,',',1,1406) +LexToken(VAR,'list',1,1422) +LexToken(OPENBRACKET,'(',1,1426) +LexToken(DQSTRING,'"vec"',1,1431) +LexToken(COMMA,',',1,1432) +LexToken(ADDITION,'-',1,1433) +LexToken(NUMBER,'1',1,1434) +LexToken(COMMA,',',1,1435) +LexToken(DQSTRING,'"vec"',1,1440) +LexToken(COMMA,',',1,1441) +LexToken(ADDITION,'-',1,1442) +LexToken(NUMBER,'1',1,1443) +LexToken(CLOSEBRACKET,')',1,1444) +LexToken(COMMA,',',1,1445) +LexToken(VAR,'exprs',1,1446) +LexToken(CLOSEBRACKET,')',1,1451) +LexToken(EOL,'\n',1,1452) +LexToken(IF,'if',1,1465) +LexToken(NOT,'~',1,1468) +LexToken(VAR,'ok',1,1469) +LexToken(THEN,'then',1,1472) +LexToken(EOL,'\n',1,1476) +LexToken(BREAK,'break',1,1493) +LexToken(COMMA,',',1,1498) +LexToken(EOL,'\n',1,1499) +LexToken(END,'end',1,1512) +LexToken(EOL,'\n',1,1515) +LexToken(VAR,'model',1,1528) +LexToken(DOT,'.',1,1533) +LexToken(VAR,'rpar',1,1534) +LexToken(ASSIGNMENT,'=',1,1538) +LexToken(OPENSQBRACKET,'[',1,1539) +LexToken(VAR,'Cvmax',1,1540) +LexToken(SEMICOLON,';',1,1545) +LexToken(VAR,'p_rho',1,1546) +LexToken(CLOSESQBRACKET,']',1,1551) +LexToken(EOL,'\n',1,1552) +LexToken(VAR,'model',1,1565) +LexToken(DOT,'.',1,1570) +LexToken(VAR,'equations',1,1571) +LexToken(DOT,'.',1,1580) +LexToken(VAR,'parameters',1,1581) +LexToken(OPENBRACKET,'(',1,1591) +LexToken(NUMBER,'2',1,1592) +LexToken(CLOSEBRACKET,')',1,1593) +LexToken(ASSIGNMENT,'=',1,1594) +LexToken(VAR,'list',1,1595) +LexToken(OPENBRACKET,'(',1,1599) +LexToken(VAR,'Cvmax',1,1600) +LexToken(COMMA,',',1,1605) +LexToken(VAR,'p_rho',1,1606) +LexToken(CLOSEBRACKET,')',1,1611) +LexToken(EOL,'\n',1,1612) +LexToken(EOL,'\n',1,1677) +LexToken(VAR,'graphics',1,1690) +LexToken(DOT,'.',1,1698) +LexToken(VAR,'exprs',1,1699) +LexToken(ASSIGNMENT,'=',1,1704) +LexToken(VAR,'exprs',1,1705) +LexToken(EOL,'\n',1,1710) +LexToken(VAR,'x',1,1723) +LexToken(DOT,'.',1,1724) +LexToken(VAR,'graphics',1,1725) +LexToken(ASSIGNMENT,'=',1,1733) +LexToken(VAR,'graphics',1,1734) +LexToken(SEMICOLON,';',1,1742) +LexToken(EOL,'\n',1,1743) +LexToken(VAR,'x',1,1756) +LexToken(DOT,'.',1,1757) +LexToken(VAR,'model',1,1758) +LexToken(ASSIGNMENT,'=',1,1763) +LexToken(VAR,'model',1,1764) +LexToken(EOL,'\n',1,1769) +LexToken(BREAK,'break',1,1782) +LexToken(EOL,'\n',1,1787) +LexToken(END,'end',1,1796) +LexToken(EOL,'\n',1,1799) +LexToken(CASE,'case',1,1804) +LexToken(DQSTRING,'"define"',1,1816) +LexToken(THEN,'then',1,1818) +LexToken(EOL,'\n',1,1822) +LexToken(VAR,'model',1,1831) +LexToken(ASSIGNMENT,'=',1,1836) +LexToken(SCICOS_MODEL,'scicos_model',1,1837) +LexToken(OPENBRACKET,'(',1,1849) +LexToken(CLOSEBRACKET,')',1,1850) +LexToken(EOL,'\n',1,1851) +LexToken(VAR,'model',1,1860) +LexToken(DOT,'.',1,1865) +LexToken(VAR,'in',1,1866) +LexToken(ASSIGNMENT,'=',1,1868) +LexToken(OPENSQBRACKET,'[',1,1869) +LexToken(NUMBER,'1',1,1870) +LexToken(SEMICOLON,';',1,1871) +LexToken(NUMBER,'1',1,1872) +LexToken(CLOSESQBRACKET,']',1,1873) +LexToken(SEMICOLON,';',1,1874) +LexToken(EOL,'\n',1,1875) +LexToken(VAR,'model',1,1884) +LexToken(DOT,'.',1,1889) +LexToken(VAR,'out',1,1890) +LexToken(ASSIGNMENT,'=',1,1893) +LexToken(OPENSQBRACKET,'[',1,1894) +LexToken(NUMBER,'1',1,1895) +LexToken(CLOSESQBRACKET,']',1,1896) +LexToken(SEMICOLON,';',1,1897) +LexToken(EOL,'\n',1,1898) +LexToken(VAR,'Cvmax',1,1907) +LexToken(ASSIGNMENT,'=',1,1912) +LexToken(NUMBER,'8005.42',1,1913) +LexToken(EOL,'\n',1,1920) +LexToken(VAR,'p_rho',1,1929) +LexToken(ASSIGNMENT,'=',1,1934) +LexToken(NUMBER,'0',1,1935) +LexToken(EOL,'\n',1,1936) +LexToken(VAR,'model',1,1945) +LexToken(DOT,'.',1,1950) +LexToken(VAR,'rpar',1,1951) +LexToken(ASSIGNMENT,'=',1,1955) +LexToken(OPENSQBRACKET,'[',1,1956) +LexToken(VAR,'Cvmax',1,1957) +LexToken(SEMICOLON,';',1,1962) +LexToken(VAR,'p_rho',1,1963) +LexToken(CLOSESQBRACKET,']',1,1968) +LexToken(EOL,'\n',1,1969) +LexToken(VAR,'model',1,1978) +LexToken(DOT,'.',1,1983) +LexToken(VAR,'sim',1,1984) +LexToken(ASSIGNMENT,'=',1,1987) +LexToken(DQSTRING,'"VanneReglante"',1,2002) +LexToken(EOL,'\n',1,2003) +LexToken(VAR,'model',1,2012) +LexToken(DOT,'.',1,2017) +LexToken(VAR,'blocktype',1,2018) +LexToken(ASSIGNMENT,'=',1,2027) +LexToken(DQSTRING,'"c"',1,2030) +LexToken(EOL,'\n',1,2031) +LexToken(VAR,'model',1,2040) +LexToken(DOT,'.',1,2045) +LexToken(VAR,'dep_ut',1,2046) +LexToken(ASSIGNMENT,'=',1,2052) +LexToken(OPENSQBRACKET,'[',1,2053) +LexToken(PREVAR_BOOLEAN,'%t',1,2054) +LexToken(PREVAR_BOOLEAN,'%f',1,2057) +LexToken(CLOSESQBRACKET,']',1,2059) LexToken(EOL,'\n',1,2060) -LexToken(VAR,'mo',1,2069) -LexToken(ASSIGNMENT,'=',1,2071) -LexToken(VAR,'modelica',1,2072) -LexToken(OPENBRACKET,'(',1,2080) -LexToken(CLOSEBRACKET,')',1,2081) -LexToken(EOL,'\n',1,2082) -LexToken(VAR,'mo',1,2091) -LexToken(DOT,'.',1,2093) -LexToken(VAR,'model',1,2094) -LexToken(ASSIGNMENT,'=',1,2099) -LexToken(DQSTRING,'"VanneReglante"',1,2114) -LexToken(EOL,'\n',1,2115) -LexToken(VAR,'mo',1,2124) -LexToken(DOT,'.',1,2126) -LexToken(VAR,'inputs',1,2127) -LexToken(ASSIGNMENT,'=',1,2133) -LexToken(OPENSQBRACKET,'[',1,2134) -LexToken(DQSTRING,'"C1"',1,2138) -LexToken(DQSTRING,'"Ouv"',1,2144) -LexToken(CLOSESQBRACKET,']',1,2145) -LexToken(SEMICOLON,';',1,2146) -LexToken(EOL,'\n',1,2147) -LexToken(VAR,'mo',1,2156) -LexToken(DOT,'.',1,2158) -LexToken(VAR,'outputs',1,2159) -LexToken(ASSIGNMENT,'=',1,2166) -LexToken(DQSTRING,'"C2"',1,2170) -LexToken(SEMICOLON,';',1,2171) -LexToken(EOL,'\n',1,2172) -LexToken(VAR,'mo',1,2181) -LexToken(DOT,'.',1,2183) -LexToken(VAR,'parameters',1,2184) -LexToken(ASSIGNMENT,'=',1,2194) -LexToken(VAR,'list',1,2195) -LexToken(OPENBRACKET,'(',1,2199) -LexToken(OPENSQBRACKET,'[',1,2200) -LexToken(DQSTRING,'"Cvmax"',1,2207) -LexToken(SEMICOLON,';',1,2208) -LexToken(DQSTRING,'"p_rho"',1,2215) -LexToken(CLOSESQBRACKET,']',1,2216) -LexToken(COMMA,',',1,2217) -LexToken(OPENSQBRACKET,'[',1,2218) -LexToken(VAR,'Cvmax',1,2219) -LexToken(SEMICOLON,';',1,2224) -LexToken(VAR,'p_rho',1,2225) -LexToken(CLOSESQBRACKET,']',1,2230) -LexToken(CLOSEBRACKET,')',1,2231) -LexToken(EOL,'\n',1,2232) -LexToken(VAR,'model',1,2241) -LexToken(DOT,'.',1,2246) -LexToken(VAR,'equations',1,2247) -LexToken(ASSIGNMENT,'=',1,2256) -LexToken(VAR,'mo',1,2257) -LexToken(EOL,'\n',1,2259) -LexToken(VAR,'model',1,2268) -LexToken(DOT,'.',1,2273) -LexToken(VAR,'in',1,2274) -LexToken(ASSIGNMENT,'=',1,2276) -LexToken(VAR,'ones',1,2277) -LexToken(OPENBRACKET,'(',1,2281) -LexToken(VAR,'size',1,2282) -LexToken(OPENBRACKET,'(',1,2286) -LexToken(VAR,'mo',1,2287) -LexToken(DOT,'.',1,2289) -LexToken(VAR,'inputs',1,2290) -LexToken(COMMA,',',1,2296) -LexToken(DQSTRING,'"*"',1,2299) -LexToken(CLOSEBRACKET,')',1,2300) -LexToken(COMMA,',',1,2301) -LexToken(NUMBER,'1',1,2302) -LexToken(CLOSEBRACKET,')',1,2303) -LexToken(EOL,'\n',1,2304) -LexToken(VAR,'model',1,2313) -LexToken(DOT,'.',1,2318) -LexToken(VAR,'out',1,2319) -LexToken(ASSIGNMENT,'=',1,2322) -LexToken(VAR,'ones',1,2323) -LexToken(OPENBRACKET,'(',1,2327) -LexToken(VAR,'size',1,2328) -LexToken(OPENBRACKET,'(',1,2332) -LexToken(VAR,'mo',1,2333) -LexToken(DOT,'.',1,2335) -LexToken(VAR,'outputs',1,2336) -LexToken(COMMA,',',1,2343) -LexToken(DQSTRING,'"*"',1,2346) -LexToken(CLOSEBRACKET,')',1,2347) -LexToken(COMMA,',',1,2348) -LexToken(NUMBER,'1',1,2349) -LexToken(CLOSEBRACKET,')',1,2350) -LexToken(EOL,'\n',1,2351) -LexToken(VAR,'exprs',1,2360) -LexToken(ASSIGNMENT,'=',1,2365) -LexToken(OPENSQBRACKET,'[',1,2366) -LexToken(VAR,'string',1,2367) -LexToken(OPENBRACKET,'(',1,2373) -LexToken(VAR,'Cvmax',1,2374) -LexToken(CLOSEBRACKET,')',1,2379) -LexToken(SEMICOLON,';',1,2380) -LexToken(VAR,'string',1,2381) -LexToken(OPENBRACKET,'(',1,2387) -LexToken(VAR,'p_rho',1,2388) -LexToken(CLOSEBRACKET,')',1,2393) -LexToken(CLOSESQBRACKET,']',1,2394) -LexToken(EOL,'\n',1,2395) -LexToken(VAR,'gr_i',1,2404) -LexToken(ASSIGNMENT,'=',1,2408) -LexToken(OPENSQBRACKET,'[',1,2409) -LexToken(CLOSESQBRACKET,']',1,2410) -LexToken(SEMICOLON,';',1,2411) -LexToken(EOL,'\n',1,2412) -LexToken(VAR,'x',1,2421) -LexToken(ASSIGNMENT,'=',1,2422) -LexToken(VAR,'standard_define',1,2423) -LexToken(OPENBRACKET,'(',1,2438) -LexToken(OPENSQBRACKET,'[',1,2439) -LexToken(NUMBER,'2',1,2440) -LexToken(NUMBER,'2',1,2442) -LexToken(CLOSESQBRACKET,']',1,2443) -LexToken(COMMA,',',1,2444) -LexToken(VAR,'model',1,2445) -LexToken(COMMA,',',1,2450) -LexToken(VAR,'exprs',1,2451) -LexToken(COMMA,',',1,2456) -LexToken(VAR,'list',1,2457) -LexToken(OPENBRACKET,'(',1,2461) -LexToken(VAR,'gr_i',1,2462) -LexToken(COMMA,',',1,2466) -LexToken(NUMBER,'0',1,2467) -LexToken(CLOSEBRACKET,')',1,2468) +LexToken(EOL,'\n',1,2061) +LexToken(VAR,'mo',1,2070) +LexToken(ASSIGNMENT,'=',1,2072) +LexToken(VAR,'modelica',1,2073) +LexToken(OPENBRACKET,'(',1,2081) +LexToken(CLOSEBRACKET,')',1,2082) +LexToken(EOL,'\n',1,2083) +LexToken(VAR,'mo',1,2092) +LexToken(DOT,'.',1,2094) +LexToken(VAR,'model',1,2095) +LexToken(ASSIGNMENT,'=',1,2100) +LexToken(DQSTRING,'"VanneReglante"',1,2115) +LexToken(EOL,'\n',1,2116) +LexToken(VAR,'mo',1,2125) +LexToken(DOT,'.',1,2127) +LexToken(VAR,'inputs',1,2128) +LexToken(ASSIGNMENT,'=',1,2134) +LexToken(OPENSQBRACKET,'[',1,2135) +LexToken(DQSTRING,'"C1"',1,2139) +LexToken(DQSTRING,'"Ouv"',1,2145) +LexToken(CLOSESQBRACKET,']',1,2146) +LexToken(SEMICOLON,';',1,2147) +LexToken(EOL,'\n',1,2148) +LexToken(VAR,'mo',1,2157) +LexToken(DOT,'.',1,2159) +LexToken(VAR,'outputs',1,2160) +LexToken(ASSIGNMENT,'=',1,2167) +LexToken(DQSTRING,'"C2"',1,2171) +LexToken(SEMICOLON,';',1,2172) +LexToken(EOL,'\n',1,2173) +LexToken(VAR,'mo',1,2182) +LexToken(DOT,'.',1,2184) +LexToken(VAR,'parameters',1,2185) +LexToken(ASSIGNMENT,'=',1,2195) +LexToken(VAR,'list',1,2196) +LexToken(OPENBRACKET,'(',1,2200) +LexToken(OPENSQBRACKET,'[',1,2201) +LexToken(DQSTRING,'"Cvmax"',1,2208) +LexToken(SEMICOLON,';',1,2209) +LexToken(DQSTRING,'"p_rho"',1,2216) +LexToken(CLOSESQBRACKET,']',1,2217) +LexToken(COMMA,',',1,2218) +LexToken(OPENSQBRACKET,'[',1,2219) +LexToken(VAR,'Cvmax',1,2220) +LexToken(SEMICOLON,';',1,2225) +LexToken(VAR,'p_rho',1,2226) +LexToken(CLOSESQBRACKET,']',1,2231) +LexToken(CLOSEBRACKET,')',1,2232) +LexToken(EOL,'\n',1,2233) +LexToken(VAR,'model',1,2242) +LexToken(DOT,'.',1,2247) +LexToken(VAR,'equations',1,2248) +LexToken(ASSIGNMENT,'=',1,2257) +LexToken(VAR,'mo',1,2258) +LexToken(EOL,'\n',1,2260) +LexToken(VAR,'model',1,2269) +LexToken(DOT,'.',1,2274) +LexToken(VAR,'in',1,2275) +LexToken(ASSIGNMENT,'=',1,2277) +LexToken(VAR,'ones',1,2278) +LexToken(OPENBRACKET,'(',1,2282) +LexToken(VAR,'size',1,2283) +LexToken(OPENBRACKET,'(',1,2287) +LexToken(VAR,'mo',1,2288) +LexToken(DOT,'.',1,2290) +LexToken(VAR,'inputs',1,2291) +LexToken(COMMA,',',1,2297) +LexToken(DQSTRING,'"*"',1,2300) +LexToken(CLOSEBRACKET,')',1,2301) +LexToken(COMMA,',',1,2302) +LexToken(NUMBER,'1',1,2303) +LexToken(CLOSEBRACKET,')',1,2304) +LexToken(EOL,'\n',1,2305) +LexToken(VAR,'model',1,2314) +LexToken(DOT,'.',1,2319) +LexToken(VAR,'out',1,2320) +LexToken(ASSIGNMENT,'=',1,2323) +LexToken(VAR,'ones',1,2324) +LexToken(OPENBRACKET,'(',1,2328) +LexToken(VAR,'size',1,2329) +LexToken(OPENBRACKET,'(',1,2333) +LexToken(VAR,'mo',1,2334) +LexToken(DOT,'.',1,2336) +LexToken(VAR,'outputs',1,2337) +LexToken(COMMA,',',1,2344) +LexToken(DQSTRING,'"*"',1,2347) +LexToken(CLOSEBRACKET,')',1,2348) +LexToken(COMMA,',',1,2349) +LexToken(NUMBER,'1',1,2350) +LexToken(CLOSEBRACKET,')',1,2351) +LexToken(EOL,'\n',1,2352) +LexToken(VAR,'exprs',1,2361) +LexToken(ASSIGNMENT,'=',1,2366) +LexToken(OPENSQBRACKET,'[',1,2367) +LexToken(VAR,'string',1,2368) +LexToken(OPENBRACKET,'(',1,2374) +LexToken(VAR,'Cvmax',1,2375) +LexToken(CLOSEBRACKET,')',1,2380) +LexToken(SEMICOLON,';',1,2381) +LexToken(VAR,'string',1,2382) +LexToken(OPENBRACKET,'(',1,2388) +LexToken(VAR,'p_rho',1,2389) +LexToken(CLOSEBRACKET,')',1,2394) +LexToken(CLOSESQBRACKET,']',1,2395) +LexToken(EOL,'\n',1,2396) +LexToken(VAR,'gr_i',1,2405) +LexToken(ASSIGNMENT,'=',1,2409) +LexToken(OPENSQBRACKET,'[',1,2410) +LexToken(CLOSESQBRACKET,']',1,2411) +LexToken(SEMICOLON,';',1,2412) +LexToken(EOL,'\n',1,2413) +LexToken(VAR,'x',1,2422) +LexToken(ASSIGNMENT,'=',1,2423) +LexToken(VAR,'standard_define',1,2424) +LexToken(OPENBRACKET,'(',1,2439) +LexToken(OPENSQBRACKET,'[',1,2440) +LexToken(NUMBER,'2',1,2441) +LexToken(NUMBER,'2',1,2443) +LexToken(CLOSESQBRACKET,']',1,2444) +LexToken(COMMA,',',1,2445) +LexToken(VAR,'model',1,2446) +LexToken(COMMA,',',1,2451) +LexToken(VAR,'exprs',1,2452) +LexToken(COMMA,',',1,2457) +LexToken(VAR,'list',1,2458) +LexToken(OPENBRACKET,'(',1,2462) +LexToken(VAR,'gr_i',1,2463) +LexToken(COMMA,',',1,2467) +LexToken(NUMBER,'0',1,2468) LexToken(CLOSEBRACKET,')',1,2469) -LexToken(EOL,'\n',1,2470) -LexToken(VAR,'x',1,2479) -LexToken(DOT,'.',1,2480) -LexToken(VAR,'graphics',1,2481) -LexToken(DOT,'.',1,2489) -LexToken(VAR,'in_implicit',1,2490) -LexToken(ASSIGNMENT,'=',1,2501) -LexToken(OPENSQBRACKET,'[',1,2502) -LexToken(DQSTRING,'"I"',1,2505) -LexToken(SEMICOLON,';',1,2506) -LexToken(DQSTRING,'"E"',1,2509) -LexToken(CLOSESQBRACKET,']',1,2510) -LexToken(EOL,'\n',1,2511) -LexToken(VAR,'x',1,2520) -LexToken(DOT,'.',1,2521) -LexToken(VAR,'graphics',1,2522) -LexToken(DOT,'.',1,2530) -LexToken(VAR,'out_implicit',1,2531) -LexToken(ASSIGNMENT,'=',1,2543) -LexToken(OPENSQBRACKET,'[',1,2544) -LexToken(DQSTRING,'"I"',1,2547) -LexToken(CLOSESQBRACKET,']',1,2548) -LexToken(EOL,'\n',1,2549) -LexToken(END,'end',1,2554) -LexToken(EOL,'\n',1,2557) -LexToken(ENDFUNCTION,'endfunction',1,2558) -LexToken(EOL,'\n',1,2569) +LexToken(CLOSEBRACKET,')',1,2470) +LexToken(EOL,'\n',1,2471) +LexToken(VAR,'x',1,2480) +LexToken(DOT,'.',1,2481) +LexToken(VAR,'graphics',1,2482) +LexToken(DOT,'.',1,2490) +LexToken(VAR,'in_implicit',1,2491) +LexToken(ASSIGNMENT,'=',1,2502) +LexToken(OPENSQBRACKET,'[',1,2503) +LexToken(DQSTRING,'"I"',1,2506) +LexToken(SEMICOLON,';',1,2507) +LexToken(DQSTRING,'"E"',1,2510) +LexToken(CLOSESQBRACKET,']',1,2511) +LexToken(EOL,'\n',1,2512) +LexToken(VAR,'x',1,2521) +LexToken(DOT,'.',1,2522) +LexToken(VAR,'graphics',1,2523) +LexToken(DOT,'.',1,2531) +LexToken(VAR,'out_implicit',1,2532) +LexToken(ASSIGNMENT,'=',1,2544) +LexToken(OPENSQBRACKET,'[',1,2545) +LexToken(DQSTRING,'"I"',1,2548) +LexToken(CLOSESQBRACKET,']',1,2549) +LexToken(EOL,'\n',1,2550) +LexToken(END,'end',1,2555) +LexToken(EOL,'\n',1,2558) +LexToken(ENDFUNCTION,'endfunction',1,2559) +LexToken(EOL,'\n',1,2570) diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index a568bd5f..6e98b8ad 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -291,12 +291,14 @@ LexToken(VAR,'n',1,2264) LexToken(ASSIGNMENT,'=',1,2265) LexToken(OPENBRACKET,'(',1,2266) LexToken(NUMBER,'2',1,2267) -LexToken(OPERATOR,'^',1,2268) +LexToken(MULTIPLICATION,'^',1,2268) LexToken(NUMBER,'32',1,2269) -LexToken(NUMBER,'-1',1,2271) +LexToken(ADDITION,'-',1,2271) +LexToken(NUMBER,'1',1,2272) LexToken(CLOSEBRACKET,')',1,2273) -LexToken(NUMBER,'-2',1,2274) -LexToken(OPERATOR,'^',1,2276) +LexToken(ADDITION,'-',1,2274) +LexToken(NUMBER,'2',1,2275) +LexToken(MULTIPLICATION,'^',1,2276) LexToken(VAR,'bit',1,2277) LexToken(SEMICOLON,';',1,2280) LexToken(EOL,'\n',1,2281) @@ -391,12 +393,14 @@ LexToken(VAR,'n',1,2807) LexToken(ASSIGNMENT,'=',1,2808) LexToken(OPENBRACKET,'(',1,2809) LexToken(NUMBER,'2',1,2810) -LexToken(OPERATOR,'^',1,2811) +LexToken(MULTIPLICATION,'^',1,2811) LexToken(NUMBER,'16',1,2812) -LexToken(NUMBER,'-1',1,2814) +LexToken(ADDITION,'-',1,2814) +LexToken(NUMBER,'1',1,2815) LexToken(CLOSEBRACKET,')',1,2816) -LexToken(NUMBER,'-2',1,2817) -LexToken(OPERATOR,'^',1,2819) +LexToken(ADDITION,'-',1,2817) +LexToken(NUMBER,'2',1,2818) +LexToken(MULTIPLICATION,'^',1,2819) LexToken(VAR,'bit',1,2820) LexToken(SEMICOLON,';',1,2823) LexToken(EOL,'\n',1,2824) @@ -491,12 +495,14 @@ LexToken(VAR,'n',1,3347) LexToken(ASSIGNMENT,'=',1,3348) LexToken(OPENBRACKET,'(',1,3349) LexToken(NUMBER,'2',1,3350) -LexToken(OPERATOR,'^',1,3351) +LexToken(MULTIPLICATION,'^',1,3351) LexToken(NUMBER,'8',1,3352) -LexToken(NUMBER,'-1',1,3353) +LexToken(ADDITION,'-',1,3353) +LexToken(NUMBER,'1',1,3354) LexToken(CLOSEBRACKET,')',1,3355) -LexToken(NUMBER,'-2',1,3356) -LexToken(OPERATOR,'^',1,3358) +LexToken(ADDITION,'-',1,3356) +LexToken(NUMBER,'2',1,3357) +LexToken(MULTIPLICATION,'^',1,3358) LexToken(VAR,'bit',1,3359) LexToken(SEMICOLON,';',1,3362) LexToken(EOL,'\n',1,3363) diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 836e022a..27e2d9cb 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -290,7 +290,7 @@ LexToken(EOL,'\n',1,2133) LexToken(VAR,'n',1,2150) LexToken(ASSIGNMENT,'=',1,2151) LexToken(NUMBER,'2',1,2152) -LexToken(OPERATOR,'^',1,2153) +LexToken(MULTIPLICATION,'^',1,2153) LexToken(VAR,'bit',1,2154) LexToken(SEMICOLON,';',1,2157) LexToken(EOL,'\n',1,2158) @@ -382,7 +382,7 @@ LexToken(EOL,'\n',1,2624) LexToken(VAR,'n',1,2641) LexToken(ASSIGNMENT,'=',1,2642) LexToken(NUMBER,'2',1,2643) -LexToken(OPERATOR,'^',1,2644) +LexToken(MULTIPLICATION,'^',1,2644) LexToken(VAR,'bit',1,2645) LexToken(SEMICOLON,';',1,2648) LexToken(EOL,'\n',1,2649) @@ -475,7 +475,7 @@ LexToken(EOL,'\n',1,3113) LexToken(VAR,'n',1,3130) LexToken(ASSIGNMENT,'=',1,3131) LexToken(NUMBER,'2',1,3132) -LexToken(OPERATOR,'^',1,3133) +LexToken(MULTIPLICATION,'^',1,3133) LexToken(VAR,'bit',1,3134) LexToken(SEMICOLON,';',1,3137) LexToken(EOL,'\n',1,3138) diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index c45e4086..346558c5 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -2627,25 +2627,29 @@ LexToken(VAR,'model',1,15657) LexToken(DOT,'.',1,15662) LexToken(VAR,'in',1,15663) LexToken(ASSIGNMENT,'=',1,15665) -LexToken(NUMBER,'-1',1,15666) +LexToken(ADDITION,'-',1,15666) +LexToken(NUMBER,'1',1,15667) LexToken(EOL,'\n',1,15668) LexToken(VAR,'model',1,15677) LexToken(DOT,'.',1,15682) LexToken(VAR,'out',1,15683) LexToken(ASSIGNMENT,'=',1,15686) -LexToken(NUMBER,'-1',1,15687) +LexToken(ADDITION,'-',1,15687) +LexToken(NUMBER,'1',1,15688) LexToken(EOL,'\n',1,15689) LexToken(VAR,'model',1,15698) LexToken(DOT,'.',1,15703) LexToken(VAR,'in2',1,15704) LexToken(ASSIGNMENT,'=',1,15707) -LexToken(NUMBER,'-2',1,15708) +LexToken(ADDITION,'-',1,15708) +LexToken(NUMBER,'2',1,15709) LexToken(EOL,'\n',1,15710) LexToken(VAR,'model',1,15719) LexToken(DOT,'.',1,15724) LexToken(VAR,'out2',1,15725) LexToken(ASSIGNMENT,'=',1,15729) -LexToken(NUMBER,'-2',1,15730) +LexToken(ADDITION,'-',1,15730) +LexToken(NUMBER,'2',1,15731) LexToken(EOL,'\n',1,15732) LexToken(VAR,'model',1,15741) LexToken(DOT,'.',1,15746) diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 04ba2016..6e2f16cc 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -523,7 +523,8 @@ LexToken(VAR,'list',1,2847) LexToken(OPENBRACKET,'(',1,2851) LexToken(DQSTRING,'"ifthel"',1,2859) LexToken(COMMA,',',1,2860) -LexToken(NUMBER,'-1',1,2861) +LexToken(ADDITION,'-',1,2861) +LexToken(NUMBER,'1',1,2862) LexToken(CLOSEBRACKET,')',1,2863) LexToken(COMMA,',',1,2864) LexToken(VAR,'in',1,2876) @@ -536,7 +537,8 @@ LexToken(NUMBER,'1',1,2896) LexToken(COMMA,',',1,2897) LexToken(VAR,'intyp',1,2909) LexToken(ASSIGNMENT,'=',1,2914) -LexToken(NUMBER,'-1',1,2915) +LexToken(ADDITION,'-',1,2915) +LexToken(NUMBER,'1',1,2916) LexToken(COMMA,',',1,2917) LexToken(VAR,'out',1,2929) LexToken(ASSIGNMENT,'=',1,2932) @@ -603,9 +605,11 @@ LexToken(COMMA,',',1,3170) LexToken(VAR,'firing',1,3182) LexToken(ASSIGNMENT,'=',1,3188) LexToken(OPENSQBRACKET,'[',1,3189) -LexToken(NUMBER,'-1',1,3190) +LexToken(ADDITION,'-',1,3190) +LexToken(NUMBER,'1',1,3191) LexToken(COMMA,',',1,3192) -LexToken(NUMBER,'-1',1,3193) +LexToken(ADDITION,'-',1,3193) +LexToken(NUMBER,'1',1,3194) LexToken(CLOSESQBRACKET,']',1,3195) LexToken(COMMA,',',1,3196) LexToken(VAR,'dep_ut',1,3208) @@ -755,17 +759,21 @@ LexToken(COMMA,',',1,3812) LexToken(VAR,'in',1,3824) LexToken(ASSIGNMENT,'=',1,3826) LexToken(OPENSQBRACKET,'[',1,3827) -LexToken(NUMBER,'-1',1,3828) +LexToken(ADDITION,'-',1,3828) +LexToken(NUMBER,'1',1,3829) LexToken(SEMICOLON,';',1,3830) -LexToken(NUMBER,'-1',1,3831) +LexToken(ADDITION,'-',1,3831) +LexToken(NUMBER,'1',1,3832) LexToken(CLOSESQBRACKET,']',1,3833) LexToken(COMMA,',',1,3834) LexToken(VAR,'in2',1,3846) LexToken(ASSIGNMENT,'=',1,3849) LexToken(OPENSQBRACKET,'[',1,3850) -LexToken(NUMBER,'-2',1,3851) +LexToken(ADDITION,'-',1,3851) +LexToken(NUMBER,'2',1,3852) LexToken(SEMICOLON,';',1,3853) -LexToken(NUMBER,'-2',1,3854) +LexToken(ADDITION,'-',1,3854) +LexToken(NUMBER,'2',1,3855) LexToken(CLOSESQBRACKET,']',1,3856) LexToken(COMMA,',',1,3857) LexToken(VAR,'intyp',1,3869) @@ -778,11 +786,13 @@ LexToken(CLOSESQBRACKET,']',1,3879) LexToken(COMMA,',',1,3880) LexToken(VAR,'out',1,3892) LexToken(ASSIGNMENT,'=',1,3895) -LexToken(NUMBER,'-1',1,3896) +LexToken(ADDITION,'-',1,3896) +LexToken(NUMBER,'1',1,3897) LexToken(COMMA,',',1,3898) LexToken(VAR,'out2',1,3910) LexToken(ASSIGNMENT,'=',1,3914) -LexToken(NUMBER,'-2',1,3915) +LexToken(ADDITION,'-',1,3915) +LexToken(NUMBER,'2',1,3916) LexToken(COMMA,',',1,3917) LexToken(VAR,'outtyp',1,3929) LexToken(ASSIGNMENT,'=',1,3935) @@ -971,11 +981,13 @@ LexToken(CLOSEBRACKET,')',1,4744) LexToken(COMMA,',',1,4745) LexToken(VAR,'in',1,4757) LexToken(ASSIGNMENT,'=',1,4759) -LexToken(NUMBER,'-1',1,4760) +LexToken(ADDITION,'-',1,4760) +LexToken(NUMBER,'1',1,4761) LexToken(COMMA,',',1,4762) LexToken(VAR,'in2',1,4774) LexToken(ASSIGNMENT,'=',1,4777) -LexToken(NUMBER,'-2',1,4778) +LexToken(ADDITION,'-',1,4778) +LexToken(NUMBER,'2',1,4779) LexToken(COMMA,',',1,4780) LexToken(VAR,'intyp',1,4792) LexToken(ASSIGNMENT,'=',1,4797) @@ -983,11 +995,13 @@ LexToken(NUMBER,'5',1,4798) LexToken(COMMA,',',1,4799) LexToken(VAR,'out',1,4811) LexToken(ASSIGNMENT,'=',1,4814) -LexToken(NUMBER,'-1',1,4815) +LexToken(ADDITION,'-',1,4815) +LexToken(NUMBER,'1',1,4816) LexToken(COMMA,',',1,4817) LexToken(VAR,'out2',1,4829) LexToken(ASSIGNMENT,'=',1,4833) -LexToken(NUMBER,'-2',1,4834) +LexToken(ADDITION,'-',1,4834) +LexToken(NUMBER,'2',1,4835) LexToken(COMMA,',',1,4836) LexToken(VAR,'outtyp',1,4848) LexToken(ASSIGNMENT,'=',1,4854) @@ -1313,11 +1327,13 @@ LexToken(CLOSEBRACKET,')',1,6118) LexToken(COMMA,',',1,6119) LexToken(VAR,'in',1,6131) LexToken(ASSIGNMENT,'=',1,6133) -LexToken(NUMBER,'-1',1,6134) +LexToken(ADDITION,'-',1,6134) +LexToken(NUMBER,'1',1,6135) LexToken(COMMA,',',1,6136) LexToken(VAR,'in2',1,6148) LexToken(ASSIGNMENT,'=',1,6151) -LexToken(NUMBER,'-2',1,6152) +LexToken(ADDITION,'-',1,6152) +LexToken(NUMBER,'2',1,6153) LexToken(COMMA,',',1,6154) LexToken(VAR,'intyp',1,6166) LexToken(ASSIGNMENT,'=',1,6171) @@ -1325,11 +1341,13 @@ LexToken(NUMBER,'5',1,6172) LexToken(COMMA,',',1,6173) LexToken(VAR,'out',1,6185) LexToken(ASSIGNMENT,'=',1,6188) -LexToken(NUMBER,'-1',1,6189) +LexToken(ADDITION,'-',1,6189) +LexToken(NUMBER,'1',1,6190) LexToken(COMMA,',',1,6191) LexToken(VAR,'out2',1,6203) LexToken(ASSIGNMENT,'=',1,6207) -LexToken(NUMBER,'-2',1,6208) +LexToken(ADDITION,'-',1,6208) +LexToken(NUMBER,'2',1,6209) LexToken(COMMA,',',1,6210) LexToken(VAR,'outtyp',1,6222) LexToken(ASSIGNMENT,'=',1,6228) @@ -1530,7 +1548,8 @@ LexToken(NUMBER,'1',1,7069) LexToken(COMMA,',',1,7070) LexToken(VAR,'out',1,7082) LexToken(ASSIGNMENT,'=',1,7085) -LexToken(NUMBER,'-1',1,7086) +LexToken(ADDITION,'-',1,7086) +LexToken(NUMBER,'1',1,7087) LexToken(COMMA,',',1,7088) LexToken(VAR,'out2',1,7100) LexToken(ASSIGNMENT,'=',1,7104) @@ -1539,7 +1558,8 @@ LexToken(CLOSESQBRACKET,']',1,7106) LexToken(COMMA,',',1,7107) LexToken(VAR,'outtyp',1,7119) LexToken(ASSIGNMENT,'=',1,7125) -LexToken(NUMBER,'-1',1,7126) +LexToken(ADDITION,'-',1,7126) +LexToken(NUMBER,'1',1,7127) LexToken(COMMA,',',1,7128) LexToken(VAR,'evtin',1,7140) LexToken(ASSIGNMENT,'=',1,7145) @@ -1798,7 +1818,8 @@ LexToken(NUMBER,'1',1,8186) LexToken(COMMA,',',1,8187) LexToken(VAR,'out',1,8199) LexToken(ASSIGNMENT,'=',1,8202) -LexToken(NUMBER,'-1',1,8203) +LexToken(ADDITION,'-',1,8203) +LexToken(NUMBER,'1',1,8204) LexToken(COMMA,',',1,8205) LexToken(VAR,'out2',1,8217) LexToken(ASSIGNMENT,'=',1,8221) @@ -1807,7 +1828,8 @@ LexToken(CLOSESQBRACKET,']',1,8223) LexToken(COMMA,',',1,8224) LexToken(VAR,'outtyp',1,8236) LexToken(ASSIGNMENT,'=',1,8242) -LexToken(NUMBER,'-1',1,8243) +LexToken(ADDITION,'-',1,8243) +LexToken(NUMBER,'1',1,8244) LexToken(COMMA,',',1,8245) LexToken(VAR,'evtin',1,8257) LexToken(ASSIGNMENT,'=',1,8262) @@ -2052,7 +2074,8 @@ LexToken(DQSTRING,'"output"',1,9254) LexToken(COMMA,',',1,9255) LexToken(VAR,'in',1,9267) LexToken(ASSIGNMENT,'=',1,9269) -LexToken(NUMBER,'-1',1,9270) +LexToken(ADDITION,'-',1,9270) +LexToken(NUMBER,'1',1,9271) LexToken(COMMA,',',1,9272) LexToken(VAR,'in2',1,9284) LexToken(ASSIGNMENT,'=',1,9287) @@ -2061,7 +2084,8 @@ LexToken(CLOSESQBRACKET,']',1,9289) LexToken(COMMA,',',1,9290) LexToken(VAR,'intyp',1,9302) LexToken(ASSIGNMENT,'=',1,9307) -LexToken(NUMBER,'-1',1,9308) +LexToken(ADDITION,'-',1,9308) +LexToken(NUMBER,'1',1,9309) LexToken(COMMA,',',1,9310) LexToken(VAR,'out',1,9322) LexToken(ASSIGNMENT,'=',1,9325) @@ -2320,7 +2344,8 @@ LexToken(DQSTRING,'"output"',1,10375) LexToken(COMMA,',',1,10376) LexToken(VAR,'in',1,10388) LexToken(ASSIGNMENT,'=',1,10390) -LexToken(NUMBER,'-1',1,10391) +LexToken(ADDITION,'-',1,10391) +LexToken(NUMBER,'1',1,10392) LexToken(COMMA,',',1,10393) LexToken(VAR,'in2',1,10405) LexToken(ASSIGNMENT,'=',1,10408) @@ -2329,7 +2354,8 @@ LexToken(CLOSESQBRACKET,']',1,10410) LexToken(COMMA,',',1,10411) LexToken(VAR,'intyp',1,10423) LexToken(ASSIGNMENT,'=',1,10428) -LexToken(NUMBER,'-1',1,10429) +LexToken(ADDITION,'-',1,10429) +LexToken(NUMBER,'1',1,10430) LexToken(COMMA,',',1,10431) LexToken(VAR,'out',1,10443) LexToken(ASSIGNMENT,'=',1,10446) @@ -2946,7 +2972,8 @@ LexToken(DQSTRING,'"d"',1,12941) LexToken(COMMA,',',1,12942) LexToken(VAR,'firing',1,12954) LexToken(ASSIGNMENT,'=',1,12960) -LexToken(NUMBER,'-1',1,12961) +LexToken(ADDITION,'-',1,12961) +LexToken(NUMBER,'1',1,12962) LexToken(COMMA,',',1,12963) LexToken(VAR,'dep_ut',1,12975) LexToken(ASSIGNMENT,'=',1,12981) @@ -3231,7 +3258,8 @@ LexToken(ASSIGNMENT,'=',1,14144) LexToken(OPENSQBRACKET,'[',1,14145) LexToken(NUMBER,'5',1,14146) LexToken(COMMA,',',1,14147) -LexToken(NUMBER,'-1',1,14148) +LexToken(ADDITION,'-',1,14148) +LexToken(NUMBER,'1',1,14149) LexToken(CLOSESQBRACKET,']',1,14150) LexToken(COMMA,',',1,14151) LexToken(VAR,'from',1,14163) @@ -3417,7 +3445,8 @@ LexToken(DQSTRING,'"d"',1,14919) LexToken(COMMA,',',1,14920) LexToken(VAR,'firing',1,14932) LexToken(ASSIGNMENT,'=',1,14938) -LexToken(NUMBER,'-1',1,14939) +LexToken(ADDITION,'-',1,14939) +LexToken(NUMBER,'1',1,14940) LexToken(COMMA,',',1,14941) LexToken(VAR,'dep_ut',1,14953) LexToken(ASSIGNMENT,'=',1,14959) @@ -3499,7 +3528,8 @@ LexToken(ASSIGNMENT,'=',1,15236) LexToken(OPENSQBRACKET,'[',1,15237) LexToken(NUMBER,'5',1,15238) LexToken(COMMA,',',1,15239) -LexToken(NUMBER,'-1',1,15240) +LexToken(ADDITION,'-',1,15240) +LexToken(NUMBER,'1',1,15241) LexToken(CLOSESQBRACKET,']',1,15242) LexToken(COMMA,',',1,15243) LexToken(VAR,'from',1,15255) @@ -3618,7 +3648,8 @@ LexToken(VAR,'list',1,15714) LexToken(OPENBRACKET,'(',1,15718) LexToken(DQSTRING,'"ifthel"',1,15726) LexToken(COMMA,',',1,15727) -LexToken(NUMBER,'-1',1,15728) +LexToken(ADDITION,'-',1,15728) +LexToken(NUMBER,'1',1,15729) LexToken(CLOSEBRACKET,')',1,15730) LexToken(COMMA,',',1,15731) LexToken(VAR,'in',1,15743) @@ -3631,7 +3662,8 @@ LexToken(NUMBER,'1',1,15763) LexToken(COMMA,',',1,15764) LexToken(VAR,'intyp',1,15776) LexToken(ASSIGNMENT,'=',1,15781) -LexToken(NUMBER,'-1',1,15782) +LexToken(ADDITION,'-',1,15782) +LexToken(NUMBER,'1',1,15783) LexToken(COMMA,',',1,15784) LexToken(VAR,'out',1,15796) LexToken(ASSIGNMENT,'=',1,15799) @@ -3698,9 +3730,11 @@ LexToken(COMMA,',',1,16037) LexToken(VAR,'firing',1,16049) LexToken(ASSIGNMENT,'=',1,16055) LexToken(OPENSQBRACKET,'[',1,16056) -LexToken(NUMBER,'-1',1,16057) +LexToken(ADDITION,'-',1,16057) +LexToken(NUMBER,'1',1,16058) LexToken(COMMA,',',1,16059) -LexToken(NUMBER,'-1',1,16060) +LexToken(ADDITION,'-',1,16060) +LexToken(NUMBER,'1',1,16061) LexToken(CLOSESQBRACKET,']',1,16062) LexToken(COMMA,',',1,16063) LexToken(VAR,'dep_ut',1,16075) @@ -3783,7 +3817,8 @@ LexToken(ASSIGNMENT,'=',1,16356) LexToken(OPENSQBRACKET,'[',1,16357) LexToken(NUMBER,'5',1,16358) LexToken(COMMA,',',1,16359) -LexToken(NUMBER,'-1',1,16360) +LexToken(ADDITION,'-',1,16360) +LexToken(NUMBER,'1',1,16361) LexToken(CLOSESQBRACKET,']',1,16362) LexToken(COMMA,',',1,16363) LexToken(VAR,'from',1,16375) @@ -4123,7 +4158,8 @@ LexToken(ASSIGNMENT,'=',1,17685) LexToken(OPENSQBRACKET,'[',1,17686) LexToken(NUMBER,'5',1,17687) LexToken(COMMA,',',1,17688) -LexToken(NUMBER,'-1',1,17689) +LexToken(ADDITION,'-',1,17689) +LexToken(NUMBER,'1',1,17690) LexToken(CLOSESQBRACKET,']',1,17691) LexToken(COMMA,',',1,17692) LexToken(VAR,'from',1,17704) @@ -4189,7 +4225,8 @@ LexToken(ASSIGNMENT,'=',1,17900) LexToken(OPENSQBRACKET,'[',1,17901) LexToken(NUMBER,'5',1,17902) LexToken(COMMA,',',1,17903) -LexToken(NUMBER,'-1',1,17904) +LexToken(ADDITION,'-',1,17904) +LexToken(NUMBER,'1',1,17905) LexToken(CLOSESQBRACKET,']',1,17906) LexToken(COMMA,',',1,17907) LexToken(VAR,'from',1,17919) @@ -4460,7 +4497,8 @@ LexToken(ASSIGNMENT,'=',1,19030) LexToken(OPENSQBRACKET,'[',1,19031) LexToken(NUMBER,'5',1,19032) LexToken(COMMA,',',1,19033) -LexToken(NUMBER,'-1',1,19034) +LexToken(ADDITION,'-',1,19034) +LexToken(NUMBER,'1',1,19035) LexToken(CLOSESQBRACKET,']',1,19036) LexToken(COMMA,',',1,19037) LexToken(VAR,'from',1,19049) @@ -4526,7 +4564,8 @@ LexToken(ASSIGNMENT,'=',1,19254) LexToken(OPENSQBRACKET,'[',1,19255) LexToken(NUMBER,'5',1,19256) LexToken(COMMA,',',1,19257) -LexToken(NUMBER,'-1',1,19258) +LexToken(ADDITION,'-',1,19258) +LexToken(NUMBER,'1',1,19259) LexToken(CLOSESQBRACKET,']',1,19260) LexToken(COMMA,',',1,19261) LexToken(VAR,'from',1,19273) @@ -4999,7 +5038,8 @@ LexToken(VAR,'list',1,21149) LexToken(OPENBRACKET,'(',1,21153) LexToken(DQSTRING,'"ifthel"',1,21161) LexToken(COMMA,',',1,21162) -LexToken(NUMBER,'-1',1,21163) +LexToken(ADDITION,'-',1,21163) +LexToken(NUMBER,'1',1,21164) LexToken(CLOSEBRACKET,')',1,21165) LexToken(COMMA,',',1,21166) LexToken(VAR,'in',1,21178) @@ -5081,9 +5121,11 @@ LexToken(COMMA,',',1,21473) LexToken(VAR,'firing',1,21485) LexToken(ASSIGNMENT,'=',1,21491) LexToken(OPENSQBRACKET,'[',1,21492) -LexToken(NUMBER,'-1',1,21493) +LexToken(ADDITION,'-',1,21493) +LexToken(NUMBER,'1',1,21494) LexToken(COMMA,',',1,21495) -LexToken(NUMBER,'-1',1,21496) +LexToken(ADDITION,'-',1,21496) +LexToken(NUMBER,'1',1,21497) LexToken(CLOSESQBRACKET,']',1,21498) LexToken(COMMA,',',1,21499) LexToken(VAR,'dep_ut',1,21511) @@ -5293,11 +5335,13 @@ LexToken(CLOSESQBRACKET,']',1,22343) LexToken(COMMA,',',1,22344) LexToken(VAR,'intyp',1,22356) LexToken(ASSIGNMENT,'=',1,22361) -LexToken(NUMBER,'-1',1,22362) +LexToken(ADDITION,'-',1,22362) +LexToken(NUMBER,'1',1,22363) LexToken(COMMA,',',1,22364) LexToken(VAR,'out',1,22376) LexToken(ASSIGNMENT,'=',1,22379) -LexToken(NUMBER,'-1',1,22380) +LexToken(ADDITION,'-',1,22380) +LexToken(NUMBER,'1',1,22381) LexToken(COMMA,',',1,22382) LexToken(VAR,'out2',1,22394) LexToken(ASSIGNMENT,'=',1,22398) @@ -5703,7 +5747,8 @@ LexToken(ASSIGNMENT,'=',1,24064) LexToken(OPENSQBRACKET,'[',1,24065) LexToken(NUMBER,'5',1,24066) LexToken(COMMA,',',1,24067) -LexToken(NUMBER,'-1',1,24068) +LexToken(ADDITION,'-',1,24068) +LexToken(NUMBER,'1',1,24069) LexToken(CLOSESQBRACKET,']',1,24070) LexToken(COMMA,',',1,24071) LexToken(VAR,'from',1,24083) @@ -5820,7 +5865,8 @@ LexToken(DQSTRING,'"csuper"',1,24556) LexToken(COMMA,',',1,24557) LexToken(VAR,'in',1,24569) LexToken(ASSIGNMENT,'=',1,24571) -LexToken(NUMBER,'-1',1,24572) +LexToken(ADDITION,'-',1,24572) +LexToken(NUMBER,'1',1,24573) LexToken(COMMA,',',1,24574) LexToken(VAR,'in2',1,24586) LexToken(ASSIGNMENT,'=',1,24589) @@ -5974,7 +6020,8 @@ LexToken(ASSIGNMENT,'=',1,25214) LexToken(OPENSQBRACKET,'[',1,25215) LexToken(NUMBER,'5',1,25216) LexToken(COMMA,',',1,25217) -LexToken(NUMBER,'-1',1,25218) +LexToken(ADDITION,'-',1,25218) +LexToken(NUMBER,'1',1,25219) LexToken(CLOSESQBRACKET,']',1,25220) LexToken(COMMA,',',1,25221) LexToken(VAR,'from',1,25233) @@ -6105,7 +6152,8 @@ LexToken(NUMBER,'1',1,25756) LexToken(COMMA,',',1,25757) LexToken(VAR,'out',1,25769) LexToken(ASSIGNMENT,'=',1,25772) -LexToken(NUMBER,'-1',1,25773) +LexToken(ADDITION,'-',1,25773) +LexToken(NUMBER,'1',1,25774) LexToken(COMMA,',',1,25775) LexToken(VAR,'out2',1,25787) LexToken(ASSIGNMENT,'=',1,25791) @@ -6114,7 +6162,8 @@ LexToken(CLOSESQBRACKET,']',1,25793) LexToken(COMMA,',',1,25794) LexToken(VAR,'outtyp',1,25806) LexToken(ASSIGNMENT,'=',1,25812) -LexToken(NUMBER,'-1',1,25813) +LexToken(ADDITION,'-',1,25813) +LexToken(NUMBER,'1',1,25814) LexToken(COMMA,',',1,25815) LexToken(VAR,'evtin',1,25827) LexToken(ASSIGNMENT,'=',1,25832) @@ -6446,7 +6495,8 @@ LexToken(VAR,'list',1,27103) LexToken(OPENBRACKET,'(',1,27107) LexToken(DQSTRING,'"ifthel"',1,27115) LexToken(COMMA,',',1,27116) -LexToken(NUMBER,'-1',1,27117) +LexToken(ADDITION,'-',1,27117) +LexToken(NUMBER,'1',1,27118) LexToken(CLOSEBRACKET,')',1,27119) LexToken(COMMA,',',1,27120) LexToken(VAR,'in',1,27132) @@ -6528,9 +6578,11 @@ LexToken(COMMA,',',1,27427) LexToken(VAR,'firing',1,27439) LexToken(ASSIGNMENT,'=',1,27445) LexToken(OPENSQBRACKET,'[',1,27446) -LexToken(NUMBER,'-1',1,27447) +LexToken(ADDITION,'-',1,27447) +LexToken(NUMBER,'1',1,27448) LexToken(COMMA,',',1,27449) -LexToken(NUMBER,'-1',1,27450) +LexToken(ADDITION,'-',1,27450) +LexToken(NUMBER,'1',1,27451) LexToken(CLOSESQBRACKET,']',1,27452) LexToken(COMMA,',',1,27453) LexToken(VAR,'dep_ut',1,27465) @@ -6745,7 +6797,8 @@ LexToken(DQSTRING,'"d"',1,28352) LexToken(COMMA,',',1,28353) LexToken(VAR,'firing',1,28365) LexToken(ASSIGNMENT,'=',1,28371) -LexToken(NUMBER,'-1',1,28372) +LexToken(ADDITION,'-',1,28372) +LexToken(NUMBER,'1',1,28373) LexToken(COMMA,',',1,28374) LexToken(VAR,'dep_ut',1,28386) LexToken(ASSIGNMENT,'=',1,28392) @@ -6835,7 +6888,8 @@ LexToken(ASSIGNMENT,'=',1,28738) LexToken(OPENSQBRACKET,'[',1,28739) LexToken(NUMBER,'5',1,28740) LexToken(COMMA,',',1,28741) -LexToken(NUMBER,'-1',1,28742) +LexToken(ADDITION,'-',1,28742) +LexToken(NUMBER,'1',1,28743) LexToken(CLOSESQBRACKET,']',1,28744) LexToken(COMMA,',',1,28745) LexToken(VAR,'from',1,28757) @@ -6905,7 +6959,8 @@ LexToken(ASSIGNMENT,'=',1,28981) LexToken(OPENSQBRACKET,'[',1,28982) LexToken(NUMBER,'5',1,28983) LexToken(COMMA,',',1,28984) -LexToken(NUMBER,'-1',1,28985) +LexToken(ADDITION,'-',1,28985) +LexToken(NUMBER,'1',1,28986) LexToken(CLOSESQBRACKET,']',1,28987) LexToken(COMMA,',',1,28988) LexToken(VAR,'from',1,29000) @@ -7032,11 +7087,13 @@ LexToken(CLOSESQBRACKET,']',1,29502) LexToken(COMMA,',',1,29503) LexToken(VAR,'intyp',1,29515) LexToken(ASSIGNMENT,'=',1,29520) -LexToken(NUMBER,'-1',1,29521) +LexToken(ADDITION,'-',1,29521) +LexToken(NUMBER,'1',1,29522) LexToken(COMMA,',',1,29523) LexToken(VAR,'out',1,29535) LexToken(ASSIGNMENT,'=',1,29538) -LexToken(NUMBER,'-1',1,29539) +LexToken(ADDITION,'-',1,29539) +LexToken(NUMBER,'1',1,29540) LexToken(COMMA,',',1,29541) LexToken(VAR,'out2',1,29553) LexToken(ASSIGNMENT,'=',1,29557) @@ -7442,7 +7499,8 @@ LexToken(ASSIGNMENT,'=',1,31225) LexToken(OPENSQBRACKET,'[',1,31226) LexToken(NUMBER,'5',1,31227) LexToken(COMMA,',',1,31228) -LexToken(NUMBER,'-1',1,31229) +LexToken(ADDITION,'-',1,31229) +LexToken(NUMBER,'1',1,31230) LexToken(CLOSESQBRACKET,']',1,31231) LexToken(COMMA,',',1,31232) LexToken(VAR,'from',1,31244) @@ -7559,7 +7617,8 @@ LexToken(DQSTRING,'"csuper"',1,31725) LexToken(COMMA,',',1,31726) LexToken(VAR,'in',1,31738) LexToken(ASSIGNMENT,'=',1,31740) -LexToken(NUMBER,'-1',1,31741) +LexToken(ADDITION,'-',1,31741) +LexToken(NUMBER,'1',1,31742) LexToken(COMMA,',',1,31743) LexToken(VAR,'in2',1,31755) LexToken(ASSIGNMENT,'=',1,31758) @@ -7709,7 +7768,8 @@ LexToken(ASSIGNMENT,'=',1,32363) LexToken(OPENSQBRACKET,'[',1,32364) LexToken(NUMBER,'5',1,32365) LexToken(COMMA,',',1,32366) -LexToken(NUMBER,'-1',1,32367) +LexToken(ADDITION,'-',1,32367) +LexToken(NUMBER,'1',1,32368) LexToken(CLOSESQBRACKET,']',1,32369) LexToken(COMMA,',',1,32370) LexToken(VAR,'from',1,32382) @@ -7909,11 +7969,14 @@ LexToken(COMMA,',',1,33116) LexToken(VAR,'in',1,33128) LexToken(ASSIGNMENT,'=',1,33130) LexToken(OPENSQBRACKET,'[',1,33131) -LexToken(NUMBER,'-1',1,33132) +LexToken(ADDITION,'-',1,33132) +LexToken(NUMBER,'1',1,33133) LexToken(SEMICOLON,';',1,33134) -LexToken(NUMBER,'-1',1,33135) +LexToken(ADDITION,'-',1,33135) +LexToken(NUMBER,'1',1,33136) LexToken(SEMICOLON,';',1,33137) -LexToken(NUMBER,'-1',1,33138) +LexToken(ADDITION,'-',1,33138) +LexToken(NUMBER,'1',1,33139) LexToken(CLOSESQBRACKET,']',1,33140) LexToken(COMMA,',',1,33141) LexToken(VAR,'in2',1,33153) @@ -7927,7 +7990,8 @@ LexToken(NUMBER,'1',1,33177) LexToken(COMMA,',',1,33178) LexToken(VAR,'out',1,33190) LexToken(ASSIGNMENT,'=',1,33193) -LexToken(NUMBER,'-1',1,33194) +LexToken(ADDITION,'-',1,33194) +LexToken(NUMBER,'1',1,33195) LexToken(COMMA,',',1,33196) LexToken(VAR,'out2',1,33208) LexToken(ASSIGNMENT,'=',1,33212) @@ -8125,7 +8189,8 @@ LexToken(DQSTRING,'"lsplit"',1,34053) LexToken(COMMA,',',1,34054) LexToken(VAR,'in',1,34066) LexToken(ASSIGNMENT,'=',1,34068) -LexToken(NUMBER,'-1',1,34069) +LexToken(ADDITION,'-',1,34069) +LexToken(NUMBER,'1',1,34070) LexToken(COMMA,',',1,34071) LexToken(VAR,'in2',1,34083) LexToken(ASSIGNMENT,'=',1,34086) @@ -8139,11 +8204,14 @@ LexToken(COMMA,',',1,34108) LexToken(VAR,'out',1,34120) LexToken(ASSIGNMENT,'=',1,34123) LexToken(OPENSQBRACKET,'[',1,34124) -LexToken(NUMBER,'-1',1,34125) +LexToken(ADDITION,'-',1,34125) +LexToken(NUMBER,'1',1,34126) LexToken(SEMICOLON,';',1,34127) -LexToken(NUMBER,'-1',1,34128) +LexToken(ADDITION,'-',1,34128) +LexToken(NUMBER,'1',1,34129) LexToken(SEMICOLON,';',1,34130) -LexToken(NUMBER,'-1',1,34131) +LexToken(ADDITION,'-',1,34131) +LexToken(NUMBER,'1',1,34132) LexToken(CLOSESQBRACKET,']',1,34133) LexToken(COMMA,',',1,34134) LexToken(VAR,'out2',1,34146) @@ -8482,7 +8550,8 @@ LexToken(DQSTRING,'"lsplit"',1,35475) LexToken(COMMA,',',1,35476) LexToken(VAR,'in',1,35488) LexToken(ASSIGNMENT,'=',1,35490) -LexToken(NUMBER,'-1',1,35491) +LexToken(ADDITION,'-',1,35491) +LexToken(NUMBER,'1',1,35492) LexToken(COMMA,',',1,35493) LexToken(VAR,'in2',1,35505) LexToken(ASSIGNMENT,'=',1,35508) @@ -8496,11 +8565,14 @@ LexToken(COMMA,',',1,35530) LexToken(VAR,'out',1,35542) LexToken(ASSIGNMENT,'=',1,35545) LexToken(OPENSQBRACKET,'[',1,35546) -LexToken(NUMBER,'-1',1,35547) +LexToken(ADDITION,'-',1,35547) +LexToken(NUMBER,'1',1,35548) LexToken(SEMICOLON,';',1,35549) -LexToken(NUMBER,'-1',1,35550) +LexToken(ADDITION,'-',1,35550) +LexToken(NUMBER,'1',1,35551) LexToken(SEMICOLON,';',1,35552) -LexToken(NUMBER,'-1',1,35553) +LexToken(ADDITION,'-',1,35553) +LexToken(NUMBER,'1',1,35554) LexToken(CLOSESQBRACKET,']',1,35555) LexToken(COMMA,',',1,35556) LexToken(VAR,'out2',1,35568) @@ -8917,17 +8989,21 @@ LexToken(COMMA,',',1,37128) LexToken(VAR,'in',1,37140) LexToken(ASSIGNMENT,'=',1,37142) LexToken(OPENSQBRACKET,'[',1,37143) -LexToken(NUMBER,'-1',1,37144) +LexToken(ADDITION,'-',1,37144) +LexToken(NUMBER,'1',1,37145) LexToken(SEMICOLON,';',1,37146) -LexToken(NUMBER,'-1',1,37147) +LexToken(ADDITION,'-',1,37147) +LexToken(NUMBER,'1',1,37148) LexToken(CLOSESQBRACKET,']',1,37149) LexToken(COMMA,',',1,37150) LexToken(VAR,'in2',1,37162) LexToken(ASSIGNMENT,'=',1,37165) LexToken(OPENSQBRACKET,'[',1,37166) -LexToken(NUMBER,'-2',1,37167) +LexToken(ADDITION,'-',1,37167) +LexToken(NUMBER,'2',1,37168) LexToken(SEMICOLON,';',1,37169) -LexToken(NUMBER,'-2',1,37170) +LexToken(ADDITION,'-',1,37170) +LexToken(NUMBER,'2',1,37171) LexToken(CLOSESQBRACKET,']',1,37172) LexToken(COMMA,',',1,37173) LexToken(VAR,'intyp',1,37185) @@ -8940,11 +9016,13 @@ LexToken(CLOSESQBRACKET,']',1,37195) LexToken(COMMA,',',1,37196) LexToken(VAR,'out',1,37208) LexToken(ASSIGNMENT,'=',1,37211) -LexToken(NUMBER,'-1',1,37212) +LexToken(ADDITION,'-',1,37212) +LexToken(NUMBER,'1',1,37213) LexToken(COMMA,',',1,37214) LexToken(VAR,'out2',1,37226) LexToken(ASSIGNMENT,'=',1,37230) -LexToken(NUMBER,'-2',1,37231) +LexToken(ADDITION,'-',1,37231) +LexToken(NUMBER,'2',1,37232) LexToken(COMMA,',',1,37233) LexToken(VAR,'outtyp',1,37245) LexToken(ASSIGNMENT,'=',1,37251) @@ -9275,7 +9353,8 @@ LexToken(DQSTRING,'"lsplit"',1,38540) LexToken(COMMA,',',1,38541) LexToken(VAR,'in',1,38553) LexToken(ASSIGNMENT,'=',1,38555) -LexToken(NUMBER,'-1',1,38556) +LexToken(ADDITION,'-',1,38556) +LexToken(NUMBER,'1',1,38557) LexToken(COMMA,',',1,38558) LexToken(VAR,'in2',1,38570) LexToken(ASSIGNMENT,'=',1,38573) @@ -9289,11 +9368,14 @@ LexToken(COMMA,',',1,38595) LexToken(VAR,'out',1,38607) LexToken(ASSIGNMENT,'=',1,38610) LexToken(OPENSQBRACKET,'[',1,38611) -LexToken(NUMBER,'-1',1,38612) +LexToken(ADDITION,'-',1,38612) +LexToken(NUMBER,'1',1,38613) LexToken(SEMICOLON,';',1,38614) -LexToken(NUMBER,'-1',1,38615) +LexToken(ADDITION,'-',1,38615) +LexToken(NUMBER,'1',1,38616) LexToken(SEMICOLON,';',1,38617) -LexToken(NUMBER,'-1',1,38618) +LexToken(ADDITION,'-',1,38618) +LexToken(NUMBER,'1',1,38619) LexToken(CLOSESQBRACKET,']',1,38620) LexToken(COMMA,',',1,38621) LexToken(VAR,'out2',1,38633) @@ -9628,7 +9710,8 @@ LexToken(DQSTRING,'"lsplit"',1,39943) LexToken(COMMA,',',1,39944) LexToken(VAR,'in',1,39956) LexToken(ASSIGNMENT,'=',1,39958) -LexToken(NUMBER,'-1',1,39959) +LexToken(ADDITION,'-',1,39959) +LexToken(NUMBER,'1',1,39960) LexToken(COMMA,',',1,39961) LexToken(VAR,'in2',1,39973) LexToken(ASSIGNMENT,'=',1,39976) @@ -9642,11 +9725,14 @@ LexToken(COMMA,',',1,39998) LexToken(VAR,'out',1,40010) LexToken(ASSIGNMENT,'=',1,40013) LexToken(OPENSQBRACKET,'[',1,40014) -LexToken(NUMBER,'-1',1,40015) +LexToken(ADDITION,'-',1,40015) +LexToken(NUMBER,'1',1,40016) LexToken(SEMICOLON,';',1,40017) -LexToken(NUMBER,'-1',1,40018) +LexToken(ADDITION,'-',1,40018) +LexToken(NUMBER,'1',1,40019) LexToken(SEMICOLON,';',1,40020) -LexToken(NUMBER,'-1',1,40021) +LexToken(ADDITION,'-',1,40021) +LexToken(NUMBER,'1',1,40022) LexToken(CLOSESQBRACKET,']',1,40023) LexToken(COMMA,',',1,40024) LexToken(VAR,'out2',1,40036) @@ -10141,7 +10227,8 @@ LexToken(ASSIGNMENT,'=',1,42002) LexToken(OPENSQBRACKET,'[',1,42003) LexToken(NUMBER,'5',1,42004) LexToken(COMMA,',',1,42005) -LexToken(NUMBER,'-1',1,42006) +LexToken(ADDITION,'-',1,42006) +LexToken(NUMBER,'1',1,42007) LexToken(CLOSESQBRACKET,']',1,42008) LexToken(COMMA,',',1,42009) LexToken(VAR,'from',1,42021) @@ -10211,7 +10298,8 @@ LexToken(ASSIGNMENT,'=',1,42246) LexToken(OPENSQBRACKET,'[',1,42247) LexToken(NUMBER,'5',1,42248) LexToken(COMMA,',',1,42249) -LexToken(NUMBER,'-1',1,42250) +LexToken(ADDITION,'-',1,42250) +LexToken(NUMBER,'1',1,42251) LexToken(CLOSESQBRACKET,']',1,42252) LexToken(COMMA,',',1,42253) LexToken(VAR,'from',1,42265) @@ -10285,7 +10373,8 @@ LexToken(ASSIGNMENT,'=',1,42511) LexToken(OPENSQBRACKET,'[',1,42512) LexToken(NUMBER,'5',1,42513) LexToken(COMMA,',',1,42514) -LexToken(NUMBER,'-1',1,42515) +LexToken(ADDITION,'-',1,42515) +LexToken(NUMBER,'1',1,42516) LexToken(CLOSESQBRACKET,']',1,42517) LexToken(COMMA,',',1,42518) LexToken(VAR,'from',1,42530) diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 430d69e4..857b829f 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -528,7 +528,8 @@ LexToken(VAR,'list',1,2932) LexToken(OPENBRACKET,'(',1,2936) LexToken(DQSTRING,'"ifthel"',1,2944) LexToken(COMMA,',',1,2945) -LexToken(NUMBER,'-1',1,2946) +LexToken(ADDITION,'-',1,2946) +LexToken(NUMBER,'1',1,2947) LexToken(CLOSEBRACKET,')',1,2948) LexToken(COMMA,',',1,2949) LexToken(VAR,'in',1,2961) @@ -541,7 +542,8 @@ LexToken(NUMBER,'1',1,2981) LexToken(COMMA,',',1,2982) LexToken(VAR,'intyp',1,2994) LexToken(ASSIGNMENT,'=',1,2999) -LexToken(NUMBER,'-1',1,3000) +LexToken(ADDITION,'-',1,3000) +LexToken(NUMBER,'1',1,3001) LexToken(COMMA,',',1,3002) LexToken(VAR,'out',1,3014) LexToken(ASSIGNMENT,'=',1,3017) @@ -609,9 +611,11 @@ LexToken(COMMA,',',1,3256) LexToken(VAR,'firing',1,3268) LexToken(ASSIGNMENT,'=',1,3274) LexToken(OPENSQBRACKET,'[',1,3275) -LexToken(NUMBER,'-1',1,3276) +LexToken(ADDITION,'-',1,3276) +LexToken(NUMBER,'1',1,3277) LexToken(COMMA,',',1,3278) -LexToken(NUMBER,'-1',1,3279) +LexToken(ADDITION,'-',1,3279) +LexToken(NUMBER,'1',1,3280) LexToken(CLOSESQBRACKET,']',1,3281) LexToken(COMMA,',',1,3282) LexToken(VAR,'dep_ut',1,3294) @@ -765,17 +769,21 @@ LexToken(COMMA,',',1,3986) LexToken(VAR,'in',1,3998) LexToken(ASSIGNMENT,'=',1,4000) LexToken(OPENSQBRACKET,'[',1,4001) -LexToken(NUMBER,'-1',1,4002) +LexToken(ADDITION,'-',1,4002) +LexToken(NUMBER,'1',1,4003) LexToken(SEMICOLON,';',1,4004) -LexToken(NUMBER,'-1',1,4005) +LexToken(ADDITION,'-',1,4005) +LexToken(NUMBER,'1',1,4006) LexToken(CLOSESQBRACKET,']',1,4007) LexToken(COMMA,',',1,4008) LexToken(VAR,'in2',1,4020) LexToken(ASSIGNMENT,'=',1,4023) LexToken(OPENSQBRACKET,'[',1,4024) -LexToken(NUMBER,'-2',1,4025) +LexToken(ADDITION,'-',1,4025) +LexToken(NUMBER,'2',1,4026) LexToken(SEMICOLON,';',1,4027) -LexToken(NUMBER,'-2',1,4028) +LexToken(ADDITION,'-',1,4028) +LexToken(NUMBER,'2',1,4029) LexToken(CLOSESQBRACKET,']',1,4030) LexToken(COMMA,',',1,4031) LexToken(VAR,'intyp',1,4043) @@ -788,11 +796,13 @@ LexToken(CLOSESQBRACKET,']',1,4053) LexToken(COMMA,',',1,4054) LexToken(VAR,'out',1,4066) LexToken(ASSIGNMENT,'=',1,4069) -LexToken(NUMBER,'-1',1,4070) +LexToken(ADDITION,'-',1,4070) +LexToken(NUMBER,'1',1,4071) LexToken(COMMA,',',1,4072) LexToken(VAR,'out2',1,4084) LexToken(ASSIGNMENT,'=',1,4088) -LexToken(NUMBER,'-2',1,4089) +LexToken(ADDITION,'-',1,4089) +LexToken(NUMBER,'2',1,4090) LexToken(COMMA,',',1,4091) LexToken(VAR,'outtyp',1,4103) LexToken(ASSIGNMENT,'=',1,4109) @@ -985,11 +995,13 @@ LexToken(CLOSEBRACKET,')',1,4978) LexToken(COMMA,',',1,4979) LexToken(VAR,'in',1,4991) LexToken(ASSIGNMENT,'=',1,4993) -LexToken(NUMBER,'-1',1,4994) +LexToken(ADDITION,'-',1,4994) +LexToken(NUMBER,'1',1,4995) LexToken(COMMA,',',1,4996) LexToken(VAR,'in2',1,5008) LexToken(ASSIGNMENT,'=',1,5011) -LexToken(NUMBER,'-2',1,5012) +LexToken(ADDITION,'-',1,5012) +LexToken(NUMBER,'2',1,5013) LexToken(COMMA,',',1,5014) LexToken(VAR,'intyp',1,5026) LexToken(ASSIGNMENT,'=',1,5031) @@ -997,11 +1009,13 @@ LexToken(NUMBER,'5',1,5032) LexToken(COMMA,',',1,5033) LexToken(VAR,'out',1,5045) LexToken(ASSIGNMENT,'=',1,5048) -LexToken(NUMBER,'-1',1,5049) +LexToken(ADDITION,'-',1,5049) +LexToken(NUMBER,'1',1,5050) LexToken(COMMA,',',1,5051) LexToken(VAR,'out2',1,5063) LexToken(ASSIGNMENT,'=',1,5067) -LexToken(NUMBER,'-2',1,5068) +LexToken(ADDITION,'-',1,5068) +LexToken(NUMBER,'2',1,5069) LexToken(COMMA,',',1,5070) LexToken(VAR,'outtyp',1,5082) LexToken(ASSIGNMENT,'=',1,5088) @@ -1199,7 +1213,8 @@ LexToken(ASSIGNMENT,'=',1,5831) LexToken(OPENSQBRACKET,'[',1,5832) LexToken(NUMBER,'5',1,5833) LexToken(COMMA,',',1,5834) -LexToken(NUMBER,'-1',1,5835) +LexToken(ADDITION,'-',1,5835) +LexToken(NUMBER,'1',1,5836) LexToken(CLOSESQBRACKET,']',1,5837) LexToken(COMMA,',',1,5838) LexToken(VAR,'from',1,5850) @@ -1397,11 +1412,13 @@ LexToken(CLOSEBRACKET,')',1,6662) LexToken(COMMA,',',1,6663) LexToken(VAR,'in',1,6675) LexToken(ASSIGNMENT,'=',1,6677) -LexToken(NUMBER,'-1',1,6678) +LexToken(ADDITION,'-',1,6678) +LexToken(NUMBER,'1',1,6679) LexToken(COMMA,',',1,6680) LexToken(VAR,'in2',1,6692) LexToken(ASSIGNMENT,'=',1,6695) -LexToken(NUMBER,'-2',1,6696) +LexToken(ADDITION,'-',1,6696) +LexToken(NUMBER,'2',1,6697) LexToken(COMMA,',',1,6698) LexToken(VAR,'intyp',1,6710) LexToken(ASSIGNMENT,'=',1,6715) @@ -1409,11 +1426,13 @@ LexToken(NUMBER,'5',1,6716) LexToken(COMMA,',',1,6717) LexToken(VAR,'out',1,6729) LexToken(ASSIGNMENT,'=',1,6732) -LexToken(NUMBER,'-1',1,6733) +LexToken(ADDITION,'-',1,6733) +LexToken(NUMBER,'1',1,6734) LexToken(COMMA,',',1,6735) LexToken(VAR,'out2',1,6747) LexToken(ASSIGNMENT,'=',1,6751) -LexToken(NUMBER,'-2',1,6752) +LexToken(ADDITION,'-',1,6752) +LexToken(NUMBER,'2',1,6753) LexToken(COMMA,',',1,6754) LexToken(VAR,'outtyp',1,6766) LexToken(ASSIGNMENT,'=',1,6772) @@ -1684,7 +1703,8 @@ LexToken(DQSTRING,'"lsplit"',1,7844) LexToken(COMMA,',',1,7845) LexToken(VAR,'in',1,7857) LexToken(ASSIGNMENT,'=',1,7859) -LexToken(NUMBER,'-1',1,7860) +LexToken(ADDITION,'-',1,7860) +LexToken(NUMBER,'1',1,7861) LexToken(COMMA,',',1,7862) LexToken(VAR,'in2',1,7874) LexToken(ASSIGNMENT,'=',1,7877) @@ -1698,11 +1718,14 @@ LexToken(COMMA,',',1,7899) LexToken(VAR,'out',1,7911) LexToken(ASSIGNMENT,'=',1,7914) LexToken(OPENSQBRACKET,'[',1,7915) -LexToken(NUMBER,'-1',1,7916) +LexToken(ADDITION,'-',1,7916) +LexToken(NUMBER,'1',1,7917) LexToken(SEMICOLON,';',1,7918) -LexToken(NUMBER,'-1',1,7919) +LexToken(ADDITION,'-',1,7919) +LexToken(NUMBER,'1',1,7920) LexToken(SEMICOLON,';',1,7921) -LexToken(NUMBER,'-1',1,7922) +LexToken(ADDITION,'-',1,7922) +LexToken(NUMBER,'1',1,7923) LexToken(CLOSESQBRACKET,']',1,7924) LexToken(COMMA,',',1,7925) LexToken(VAR,'out2',1,7937) @@ -1980,7 +2003,8 @@ LexToken(NUMBER,'1',1,9054) LexToken(COMMA,',',1,9055) LexToken(VAR,'out',1,9067) LexToken(ASSIGNMENT,'=',1,9070) -LexToken(NUMBER,'-1',1,9071) +LexToken(ADDITION,'-',1,9071) +LexToken(NUMBER,'1',1,9072) LexToken(COMMA,',',1,9073) LexToken(VAR,'out2',1,9085) LexToken(ASSIGNMENT,'=',1,9089) @@ -1989,7 +2013,8 @@ LexToken(CLOSESQBRACKET,']',1,9091) LexToken(COMMA,',',1,9092) LexToken(VAR,'outtyp',1,9104) LexToken(ASSIGNMENT,'=',1,9110) -LexToken(NUMBER,'-1',1,9111) +LexToken(ADDITION,'-',1,9111) +LexToken(NUMBER,'1',1,9112) LexToken(COMMA,',',1,9113) LexToken(VAR,'evtin',1,9125) LexToken(ASSIGNMENT,'=',1,9130) @@ -2252,7 +2277,8 @@ LexToken(NUMBER,'1',1,10181) LexToken(COMMA,',',1,10182) LexToken(VAR,'out',1,10194) LexToken(ASSIGNMENT,'=',1,10197) -LexToken(NUMBER,'-1',1,10198) +LexToken(ADDITION,'-',1,10198) +LexToken(NUMBER,'1',1,10199) LexToken(COMMA,',',1,10200) LexToken(VAR,'out2',1,10212) LexToken(ASSIGNMENT,'=',1,10216) @@ -2261,7 +2287,8 @@ LexToken(CLOSESQBRACKET,']',1,10218) LexToken(COMMA,',',1,10219) LexToken(VAR,'outtyp',1,10231) LexToken(ASSIGNMENT,'=',1,10237) -LexToken(NUMBER,'-1',1,10238) +LexToken(ADDITION,'-',1,10238) +LexToken(NUMBER,'1',1,10239) LexToken(COMMA,',',1,10240) LexToken(VAR,'evtin',1,10252) LexToken(ASSIGNMENT,'=',1,10257) @@ -2510,7 +2537,8 @@ LexToken(DQSTRING,'"output"',1,11258) LexToken(COMMA,',',1,11259) LexToken(VAR,'in',1,11271) LexToken(ASSIGNMENT,'=',1,11273) -LexToken(NUMBER,'-1',1,11274) +LexToken(ADDITION,'-',1,11274) +LexToken(NUMBER,'1',1,11275) LexToken(COMMA,',',1,11276) LexToken(VAR,'in2',1,11288) LexToken(ASSIGNMENT,'=',1,11291) @@ -2519,7 +2547,8 @@ LexToken(CLOSESQBRACKET,']',1,11293) LexToken(COMMA,',',1,11294) LexToken(VAR,'intyp',1,11306) LexToken(ASSIGNMENT,'=',1,11311) -LexToken(NUMBER,'-1',1,11312) +LexToken(ADDITION,'-',1,11312) +LexToken(NUMBER,'1',1,11313) LexToken(COMMA,',',1,11314) LexToken(VAR,'out',1,11326) LexToken(ASSIGNMENT,'=',1,11329) @@ -2782,7 +2811,8 @@ LexToken(DQSTRING,'"output"',1,12389) LexToken(COMMA,',',1,12390) LexToken(VAR,'in',1,12402) LexToken(ASSIGNMENT,'=',1,12404) -LexToken(NUMBER,'-1',1,12405) +LexToken(ADDITION,'-',1,12405) +LexToken(NUMBER,'1',1,12406) LexToken(COMMA,',',1,12407) LexToken(VAR,'in2',1,12419) LexToken(ASSIGNMENT,'=',1,12422) @@ -2791,7 +2821,8 @@ LexToken(CLOSESQBRACKET,']',1,12424) LexToken(COMMA,',',1,12425) LexToken(VAR,'intyp',1,12437) LexToken(ASSIGNMENT,'=',1,12442) -LexToken(NUMBER,'-1',1,12443) +LexToken(ADDITION,'-',1,12443) +LexToken(NUMBER,'1',1,12444) LexToken(COMMA,',',1,12445) LexToken(VAR,'out',1,12457) LexToken(ASSIGNMENT,'=',1,12460) @@ -3016,7 +3047,8 @@ LexToken(VAR,'intyp',1,13246) LexToken(ASSIGNMENT,'=',1,13251) LexToken(OPENSQBRACKET,'[',1,13252) LexToken(NUMBER,'5',1,13253) -LexToken(NUMBER,'-1',1,13255) +LexToken(ADDITION,'-',1,13255) +LexToken(NUMBER,'1',1,13256) LexToken(CLOSESQBRACKET,']',1,13257) LexToken(EOL,'\n',1,13258) LexToken(VAR,'model',1,13267) diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 00c260c2..9313782c 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -209,7 +209,8 @@ LexToken(NUMBER,'1',1,2110) LexToken(COMMA,',',1,2111) LexToken(DQSTRING,'"vec"',1,2116) LexToken(COMMA,',',1,2117) -LexToken(NUMBER,'-1',1,2118) +LexToken(ADDITION,'-',1,2118) +LexToken(NUMBER,'1',1,2119) LexToken(COMMA,',',1,2120) LexToken(DQSTRING,'"vec"',1,2125) LexToken(COMMA,',',1,2126) @@ -535,7 +536,7 @@ LexToken(VAR,'bit',1,4097) LexToken(OPENBRACKET,'(',1,4100) LexToken(NUMBER,'2',1,4101) LexToken(CLOSEBRACKET,')',1,4102) -LexToken(OPERATOR,'-',1,4103) +LexToken(ADDITION,'-',1,4103) LexToken(VAR,'bit',1,4104) LexToken(OPENBRACKET,'(',1,4107) LexToken(NUMBER,'1',1,4108) diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 76c0d8c1..661841e5 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -169,7 +169,7 @@ LexToken(EOL,'\n',1,1567) LexToken(VAR,'it',1,1580) LexToken(ASSIGNMENT,'=',1,1582) LexToken(VAR,'Datatype',1,1583) -LexToken(OPERATOR,'*',1,1591) +LexToken(MULTIPLICATION,'*',1,1591) LexToken(VAR,'ones',1,1592) LexToken(OPENBRACKET,'(',1,1596) LexToken(NUMBER,'1',1,1597) @@ -730,32 +730,38 @@ LexToken(DOT,'.',1,4521) LexToken(VAR,'in',1,4522) LexToken(ASSIGNMENT,'=',1,4524) LexToken(OPENSQBRACKET,'[',1,4525) -LexToken(NUMBER,'-1',1,4526) +LexToken(ADDITION,'-',1,4526) +LexToken(NUMBER,'1',1,4527) LexToken(SEMICOLON,';',1,4528) -LexToken(NUMBER,'-2',1,4529) +LexToken(ADDITION,'-',1,4529) +LexToken(NUMBER,'2',1,4530) LexToken(CLOSESQBRACKET,']',1,4531) LexToken(EOL,'\n',1,4532) LexToken(VAR,'model',1,4541) LexToken(DOT,'.',1,4546) LexToken(VAR,'out',1,4547) LexToken(ASSIGNMENT,'=',1,4550) -LexToken(NUMBER,'-1',1,4551) +LexToken(ADDITION,'-',1,4551) +LexToken(NUMBER,'1',1,4552) LexToken(EOL,'\n',1,4553) LexToken(VAR,'model',1,4562) LexToken(DOT,'.',1,4567) LexToken(VAR,'in2',1,4568) LexToken(ASSIGNMENT,'=',1,4571) LexToken(OPENSQBRACKET,'[',1,4572) -LexToken(NUMBER,'-2',1,4573) +LexToken(ADDITION,'-',1,4573) +LexToken(NUMBER,'2',1,4574) LexToken(SEMICOLON,';',1,4575) -LexToken(NUMBER,'-3',1,4576) +LexToken(ADDITION,'-',1,4576) +LexToken(NUMBER,'3',1,4577) LexToken(CLOSESQBRACKET,']',1,4578) LexToken(EOL,'\n',1,4579) LexToken(VAR,'model',1,4588) LexToken(DOT,'.',1,4593) LexToken(VAR,'out2',1,4594) LexToken(ASSIGNMENT,'=',1,4598) -LexToken(NUMBER,'-3',1,4599) +LexToken(ADDITION,'-',1,4599) +LexToken(NUMBER,'3',1,4600) LexToken(EOL,'\n',1,4601) LexToken(VAR,'model',1,4610) LexToken(DOT,'.',1,4615) diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 38171542..e22ca6df 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -344,7 +344,7 @@ LexToken(VAR,'size',1,2539) LexToken(OPENBRACKET,'(',1,2543) LexToken(VAR,'newpar',1,2544) LexToken(CLOSEBRACKET,')',1,2550) -LexToken(OPERATOR,'+',1,2551) +LexToken(ADDITION,'+',1,2551) LexToken(NUMBER,'1',1,2552) LexToken(CLOSEBRACKET,')',1,2553) LexToken(ASSIGNMENT,'=',1,2554) @@ -1025,7 +1025,8 @@ LexToken(CLOSESQBRACKET,']',1,5277) LexToken(COMMA,',',1,5278) LexToken(VAR,'ipar',1,5290) LexToken(ASSIGNMENT,'=',1,5294) -LexToken(NUMBER,'-1',1,5295) +LexToken(ADDITION,'-',1,5295) +LexToken(NUMBER,'1',1,5296) LexToken(COMMA,',',1,5297) LexToken(VAR,'opar',1,5309) LexToken(ASSIGNMENT,'=',1,5313) @@ -1176,7 +1177,8 @@ LexToken(VAR,'list',1,5942) LexToken(OPENBRACKET,'(',1,5946) LexToken(DQSTRING,'"ifthel"',1,5954) LexToken(COMMA,',',1,5955) -LexToken(NUMBER,'-1',1,5956) +LexToken(ADDITION,'-',1,5956) +LexToken(NUMBER,'1',1,5957) LexToken(CLOSEBRACKET,')',1,5958) LexToken(COMMA,',',1,5959) LexToken(VAR,'in',1,5971) @@ -1258,9 +1260,11 @@ LexToken(COMMA,',',1,6266) LexToken(VAR,'firing',1,6278) LexToken(ASSIGNMENT,'=',1,6284) LexToken(OPENSQBRACKET,'[',1,6285) -LexToken(NUMBER,'-1',1,6286) +LexToken(ADDITION,'-',1,6286) +LexToken(NUMBER,'1',1,6287) LexToken(COMMA,',',1,6288) -LexToken(NUMBER,'-1',1,6289) +LexToken(ADDITION,'-',1,6289) +LexToken(NUMBER,'1',1,6290) LexToken(CLOSESQBRACKET,']',1,6291) LexToken(COMMA,',',1,6292) LexToken(VAR,'dep_ut',1,6304) @@ -1474,7 +1478,8 @@ LexToken(NUMBER,'1',1,7155) LexToken(COMMA,',',1,7156) LexToken(VAR,'out',1,7168) LexToken(ASSIGNMENT,'=',1,7171) -LexToken(NUMBER,'-1',1,7172) +LexToken(ADDITION,'-',1,7172) +LexToken(NUMBER,'1',1,7173) LexToken(COMMA,',',1,7174) LexToken(VAR,'out2',1,7186) LexToken(ASSIGNMENT,'=',1,7190) @@ -1880,7 +1885,8 @@ LexToken(ASSIGNMENT,'=',1,8856) LexToken(OPENSQBRACKET,'[',1,8857) LexToken(NUMBER,'5',1,8858) LexToken(COMMA,',',1,8859) -LexToken(NUMBER,'-1',1,8860) +LexToken(ADDITION,'-',1,8860) +LexToken(NUMBER,'1',1,8861) LexToken(CLOSESQBRACKET,']',1,8862) LexToken(COMMA,',',1,8863) LexToken(VAR,'from',1,8875) @@ -1997,7 +2003,8 @@ LexToken(DQSTRING,'"csuper"',1,9348) LexToken(COMMA,',',1,9349) LexToken(VAR,'in',1,9361) LexToken(ASSIGNMENT,'=',1,9363) -LexToken(NUMBER,'-1',1,9364) +LexToken(ADDITION,'-',1,9364) +LexToken(NUMBER,'1',1,9365) LexToken(COMMA,',',1,9366) LexToken(VAR,'in2',1,9378) LexToken(ASSIGNMENT,'=',1,9381) @@ -2605,7 +2612,8 @@ LexToken(DQSTRING,'"lsplit"',1,11757) LexToken(COMMA,',',1,11758) LexToken(VAR,'in',1,11770) LexToken(ASSIGNMENT,'=',1,11772) -LexToken(NUMBER,'-1',1,11773) +LexToken(ADDITION,'-',1,11773) +LexToken(NUMBER,'1',1,11774) LexToken(COMMA,',',1,11775) LexToken(VAR,'in2',1,11787) LexToken(ASSIGNMENT,'=',1,11790) @@ -2619,11 +2627,14 @@ LexToken(COMMA,',',1,11812) LexToken(VAR,'out',1,11824) LexToken(ASSIGNMENT,'=',1,11827) LexToken(OPENSQBRACKET,'[',1,11828) -LexToken(NUMBER,'-1',1,11829) +LexToken(ADDITION,'-',1,11829) +LexToken(NUMBER,'1',1,11830) LexToken(SEMICOLON,';',1,11831) -LexToken(NUMBER,'-1',1,11832) +LexToken(ADDITION,'-',1,11832) +LexToken(NUMBER,'1',1,11833) LexToken(SEMICOLON,';',1,11834) -LexToken(NUMBER,'-1',1,11835) +LexToken(ADDITION,'-',1,11835) +LexToken(NUMBER,'1',1,11836) LexToken(CLOSESQBRACKET,']',1,11837) LexToken(COMMA,',',1,11838) LexToken(VAR,'out2',1,11850) @@ -2840,7 +2851,8 @@ LexToken(ASSIGNMENT,'=',1,12673) LexToken(OPENSQBRACKET,'[',1,12674) LexToken(NUMBER,'5',1,12675) LexToken(COMMA,',',1,12676) -LexToken(NUMBER,'-1',1,12677) +LexToken(ADDITION,'-',1,12677) +LexToken(NUMBER,'1',1,12678) LexToken(CLOSESQBRACKET,']',1,12679) LexToken(COMMA,',',1,12680) LexToken(VAR,'from',1,12692) @@ -2968,11 +2980,13 @@ LexToken(CLOSEBRACKET,')',1,13194) LexToken(COMMA,',',1,13195) LexToken(VAR,'in',1,13207) LexToken(ASSIGNMENT,'=',1,13209) -LexToken(NUMBER,'-1',1,13210) +LexToken(ADDITION,'-',1,13210) +LexToken(NUMBER,'1',1,13211) LexToken(COMMA,',',1,13212) LexToken(VAR,'in2',1,13224) LexToken(ASSIGNMENT,'=',1,13227) -LexToken(NUMBER,'-2',1,13228) +LexToken(ADDITION,'-',1,13228) +LexToken(NUMBER,'2',1,13229) LexToken(COMMA,',',1,13230) LexToken(VAR,'intyp',1,13242) LexToken(ASSIGNMENT,'=',1,13247) @@ -2980,11 +2994,13 @@ LexToken(NUMBER,'5',1,13248) LexToken(COMMA,',',1,13249) LexToken(VAR,'out',1,13261) LexToken(ASSIGNMENT,'=',1,13264) -LexToken(NUMBER,'-1',1,13265) +LexToken(ADDITION,'-',1,13265) +LexToken(NUMBER,'1',1,13266) LexToken(COMMA,',',1,13267) LexToken(VAR,'out2',1,13279) LexToken(ASSIGNMENT,'=',1,13283) -LexToken(NUMBER,'-2',1,13284) +LexToken(ADDITION,'-',1,13284) +LexToken(NUMBER,'2',1,13285) LexToken(COMMA,',',1,13286) LexToken(VAR,'outtyp',1,13298) LexToken(ASSIGNMENT,'=',1,13304) @@ -3180,7 +3196,8 @@ LexToken(DQSTRING,'"lsplit"',1,14126) LexToken(COMMA,',',1,14127) LexToken(VAR,'in',1,14139) LexToken(ASSIGNMENT,'=',1,14141) -LexToken(NUMBER,'-1',1,14142) +LexToken(ADDITION,'-',1,14142) +LexToken(NUMBER,'1',1,14143) LexToken(COMMA,',',1,14144) LexToken(VAR,'in2',1,14156) LexToken(ASSIGNMENT,'=',1,14159) @@ -3194,11 +3211,14 @@ LexToken(COMMA,',',1,14181) LexToken(VAR,'out',1,14193) LexToken(ASSIGNMENT,'=',1,14196) LexToken(OPENSQBRACKET,'[',1,14197) -LexToken(NUMBER,'-1',1,14198) +LexToken(ADDITION,'-',1,14198) +LexToken(NUMBER,'1',1,14199) LexToken(SEMICOLON,';',1,14200) -LexToken(NUMBER,'-1',1,14201) +LexToken(ADDITION,'-',1,14201) +LexToken(NUMBER,'1',1,14202) LexToken(SEMICOLON,';',1,14203) -LexToken(NUMBER,'-1',1,14204) +LexToken(ADDITION,'-',1,14204) +LexToken(NUMBER,'1',1,14205) LexToken(CLOSESQBRACKET,']',1,14206) LexToken(COMMA,',',1,14207) LexToken(VAR,'out2',1,14219) @@ -3538,7 +3558,8 @@ LexToken(NUMBER,'1',1,15550) LexToken(COMMA,',',1,15551) LexToken(VAR,'out',1,15563) LexToken(ASSIGNMENT,'=',1,15566) -LexToken(NUMBER,'-1',1,15567) +LexToken(ADDITION,'-',1,15567) +LexToken(NUMBER,'1',1,15568) LexToken(COMMA,',',1,15569) LexToken(VAR,'out2',1,15581) LexToken(ASSIGNMENT,'=',1,15585) @@ -3547,7 +3568,8 @@ LexToken(CLOSESQBRACKET,']',1,15587) LexToken(COMMA,',',1,15588) LexToken(VAR,'outtyp',1,15600) LexToken(ASSIGNMENT,'=',1,15606) -LexToken(NUMBER,'-1',1,15607) +LexToken(ADDITION,'-',1,15607) +LexToken(NUMBER,'1',1,15608) LexToken(COMMA,',',1,15609) LexToken(VAR,'evtin',1,15621) LexToken(ASSIGNMENT,'=',1,15626) @@ -3806,7 +3828,8 @@ LexToken(NUMBER,'1',1,16669) LexToken(COMMA,',',1,16670) LexToken(VAR,'out',1,16682) LexToken(ASSIGNMENT,'=',1,16685) -LexToken(NUMBER,'-1',1,16686) +LexToken(ADDITION,'-',1,16686) +LexToken(NUMBER,'1',1,16687) LexToken(COMMA,',',1,16688) LexToken(VAR,'out2',1,16700) LexToken(ASSIGNMENT,'=',1,16704) @@ -3815,7 +3838,8 @@ LexToken(CLOSESQBRACKET,']',1,16706) LexToken(COMMA,',',1,16707) LexToken(VAR,'outtyp',1,16719) LexToken(ASSIGNMENT,'=',1,16725) -LexToken(NUMBER,'-1',1,16726) +LexToken(ADDITION,'-',1,16726) +LexToken(NUMBER,'1',1,16727) LexToken(COMMA,',',1,16728) LexToken(VAR,'evtin',1,16740) LexToken(ASSIGNMENT,'=',1,16745) @@ -4074,7 +4098,8 @@ LexToken(NUMBER,'1',1,17786) LexToken(COMMA,',',1,17787) LexToken(VAR,'out',1,17799) LexToken(ASSIGNMENT,'=',1,17802) -LexToken(NUMBER,'-1',1,17803) +LexToken(ADDITION,'-',1,17803) +LexToken(NUMBER,'1',1,17804) LexToken(COMMA,',',1,17805) LexToken(VAR,'out2',1,17817) LexToken(ASSIGNMENT,'=',1,17821) @@ -4083,7 +4108,8 @@ LexToken(CLOSESQBRACKET,']',1,17823) LexToken(COMMA,',',1,17824) LexToken(VAR,'outtyp',1,17836) LexToken(ASSIGNMENT,'=',1,17842) -LexToken(NUMBER,'-1',1,17843) +LexToken(ADDITION,'-',1,17843) +LexToken(NUMBER,'1',1,17844) LexToken(COMMA,',',1,17845) LexToken(VAR,'evtin',1,17857) LexToken(ASSIGNMENT,'=',1,17862) @@ -4328,7 +4354,8 @@ LexToken(DQSTRING,'"output"',1,18852) LexToken(COMMA,',',1,18853) LexToken(VAR,'in',1,18865) LexToken(ASSIGNMENT,'=',1,18867) -LexToken(NUMBER,'-1',1,18868) +LexToken(ADDITION,'-',1,18868) +LexToken(NUMBER,'1',1,18869) LexToken(COMMA,',',1,18870) LexToken(VAR,'in2',1,18882) LexToken(ASSIGNMENT,'=',1,18885) @@ -4337,7 +4364,8 @@ LexToken(CLOSESQBRACKET,']',1,18887) LexToken(COMMA,',',1,18888) LexToken(VAR,'intyp',1,18900) LexToken(ASSIGNMENT,'=',1,18905) -LexToken(NUMBER,'-1',1,18906) +LexToken(ADDITION,'-',1,18906) +LexToken(NUMBER,'1',1,18907) LexToken(COMMA,',',1,18908) LexToken(VAR,'out',1,18920) LexToken(ASSIGNMENT,'=',1,18923) @@ -4596,7 +4624,8 @@ LexToken(DQSTRING,'"output"',1,19973) LexToken(COMMA,',',1,19974) LexToken(VAR,'in',1,19986) LexToken(ASSIGNMENT,'=',1,19988) -LexToken(NUMBER,'-1',1,19989) +LexToken(ADDITION,'-',1,19989) +LexToken(NUMBER,'1',1,19990) LexToken(COMMA,',',1,19991) LexToken(VAR,'in2',1,20003) LexToken(ASSIGNMENT,'=',1,20006) @@ -4605,7 +4634,8 @@ LexToken(CLOSESQBRACKET,']',1,20008) LexToken(COMMA,',',1,20009) LexToken(VAR,'intyp',1,20021) LexToken(ASSIGNMENT,'=',1,20026) -LexToken(NUMBER,'-1',1,20027) +LexToken(ADDITION,'-',1,20027) +LexToken(NUMBER,'1',1,20028) LexToken(COMMA,',',1,20029) LexToken(VAR,'out',1,20041) LexToken(ASSIGNMENT,'=',1,20044) diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index c3295914..7d882b7c 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -158,9 +158,11 @@ LexToken(OPENBRACKET,'(',1,1628) LexToken(DQSTRING,'"mat"',1,1633) LexToken(COMMA,',',1,1634) LexToken(OPENSQBRACKET,'[',1,1635) -LexToken(NUMBER,'-1',1,1636) +LexToken(ADDITION,'-',1,1636) +LexToken(NUMBER,'1',1,1637) LexToken(COMMA,',',1,1638) -LexToken(NUMBER,'-2',1,1639) +LexToken(ADDITION,'-',1,1639) +LexToken(NUMBER,'2',1,1640) LexToken(CLOSESQBRACKET,']',1,1641) LexToken(COMMA,',',1,1642) LexToken(DQSTRING,'"vec"',1,1647) @@ -204,7 +206,7 @@ LexToken(COMMA,',',1,1783) LexToken(NUMBER,'1',1,1784) LexToken(CLOSEBRACKET,')',1,1785) LexToken(CLOSEBRACKET,')',1,1786) -LexToken(OPERATOR,'/',1,1787) +LexToken(MULTIPLICATION,'/',1,1787) LexToken(VAR,'log',1,1788) LexToken(OPENBRACKET,'(',1,1791) LexToken(NUMBER,'2',1,1792) @@ -404,7 +406,7 @@ LexToken(EOL,'\n',1,2888) LexToken(VAR,'it',1,2905) LexToken(ASSIGNMENT,'=',1,2907) LexToken(NUMBER,'5',1,2908) -LexToken(OPERATOR,'*',1,2909) +LexToken(MULTIPLICATION,'*',1,2909) LexToken(VAR,'ones',1,2910) LexToken(OPENBRACKET,'(',1,2914) LexToken(NUMBER,'1',1,2915) @@ -415,7 +417,7 @@ LexToken(EOL,'\n',1,2921) LexToken(VAR,'ot',1,2938) LexToken(ASSIGNMENT,'=',1,2940) LexToken(NUMBER,'5',1,2941) -LexToken(OPERATOR,'*',1,2942) +LexToken(MULTIPLICATION,'*',1,2942) LexToken(VAR,'ones',1,2943) LexToken(OPENBRACKET,'(',1,2947) LexToken(NUMBER,'1',1,2948) @@ -454,7 +456,7 @@ LexToken(COMMA,',',1,3038) LexToken(VAR,'ones',1,3039) LexToken(OPENBRACKET,'(',1,3043) LexToken(NUMBER,'1',1,3044) -LexToken(OPERATOR,'-',1,3045) +LexToken(ADDITION,'-',1,3045) LexToken(VAR,'herit',1,3046) LexToken(COMMA,',',1,3051) LexToken(NUMBER,'1',1,3052) diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 4723bf88..5ad98cb5 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -650,9 +650,11 @@ LexToken(COMMA,',',1,4730) LexToken(VAR,'list',1,4751) LexToken(OPENBRACKET,'(',1,4755) LexToken(OPENSQBRACKET,'[',1,4756) -LexToken(NUMBER,'-1',1,4757) +LexToken(ADDITION,'-',1,4757) +LexToken(NUMBER,'1',1,4758) LexToken(COMMA,',',1,4759) -LexToken(NUMBER,'-2',1,4760) +LexToken(ADDITION,'-',1,4760) +LexToken(NUMBER,'2',1,4761) LexToken(CLOSESQBRACKET,']',1,4762) LexToken(COMMA,',',1,4763) LexToken(VAR,'it',1,4764) @@ -661,9 +663,11 @@ LexToken(COMMA,',',1,4767) LexToken(VAR,'list',1,4788) LexToken(OPENBRACKET,'(',1,4792) LexToken(OPENSQBRACKET,'[',1,4793) -LexToken(NUMBER,'-1',1,4794) +LexToken(ADDITION,'-',1,4794) +LexToken(NUMBER,'1',1,4795) LexToken(COMMA,',',1,4796) -LexToken(NUMBER,'-2',1,4797) +LexToken(ADDITION,'-',1,4797) +LexToken(NUMBER,'2',1,4798) LexToken(CLOSESQBRACKET,']',1,4799) LexToken(COMMA,',',1,4800) LexToken(VAR,'ot',1,4801) @@ -751,25 +755,29 @@ LexToken(VAR,'model',1,5169) LexToken(DOT,'.',1,5174) LexToken(VAR,'in',1,5175) LexToken(ASSIGNMENT,'=',1,5177) -LexToken(NUMBER,'-1',1,5178) +LexToken(ADDITION,'-',1,5178) +LexToken(NUMBER,'1',1,5179) LexToken(EOL,'\n',1,5180) LexToken(VAR,'model',1,5189) LexToken(DOT,'.',1,5194) LexToken(VAR,'out',1,5195) LexToken(ASSIGNMENT,'=',1,5198) -LexToken(NUMBER,'-1',1,5199) +LexToken(ADDITION,'-',1,5199) +LexToken(NUMBER,'1',1,5200) LexToken(EOL,'\n',1,5201) LexToken(VAR,'model',1,5210) LexToken(DOT,'.',1,5215) LexToken(VAR,'in2',1,5216) LexToken(ASSIGNMENT,'=',1,5219) -LexToken(NUMBER,'-2',1,5220) +LexToken(ADDITION,'-',1,5220) +LexToken(NUMBER,'2',1,5221) LexToken(EOL,'\n',1,5222) LexToken(VAR,'model',1,5231) LexToken(DOT,'.',1,5236) LexToken(VAR,'out2',1,5237) LexToken(ASSIGNMENT,'=',1,5241) -LexToken(NUMBER,'-2',1,5242) +LexToken(ADDITION,'-',1,5242) +LexToken(NUMBER,'2',1,5243) LexToken(EOL,'\n',1,5244) LexToken(VAR,'model',1,5253) LexToken(DOT,'.',1,5258) diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 829fb03f..65ac1903 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -343,7 +343,7 @@ LexToken(VAR,'size',1,2467) LexToken(OPENBRACKET,'(',1,2471) LexToken(VAR,'newpar',1,2472) LexToken(CLOSEBRACKET,')',1,2478) -LexToken(OPERATOR,'+',1,2479) +LexToken(ADDITION,'+',1,2479) LexToken(NUMBER,'1',1,2480) LexToken(CLOSEBRACKET,')',1,2481) LexToken(ASSIGNMENT,'=',1,2482) @@ -1264,7 +1264,8 @@ LexToken(DQSTRING,'"lsplit"',1,6096) LexToken(COMMA,',',1,6097) LexToken(VAR,'in',1,6109) LexToken(ASSIGNMENT,'=',1,6111) -LexToken(NUMBER,'-1',1,6112) +LexToken(ADDITION,'-',1,6112) +LexToken(NUMBER,'1',1,6113) LexToken(COMMA,',',1,6114) LexToken(VAR,'in2',1,6126) LexToken(ASSIGNMENT,'=',1,6129) @@ -1278,11 +1279,14 @@ LexToken(COMMA,',',1,6151) LexToken(VAR,'out',1,6163) LexToken(ASSIGNMENT,'=',1,6166) LexToken(OPENSQBRACKET,'[',1,6167) -LexToken(NUMBER,'-1',1,6168) +LexToken(ADDITION,'-',1,6168) +LexToken(NUMBER,'1',1,6169) LexToken(SEMICOLON,';',1,6170) -LexToken(NUMBER,'-1',1,6171) +LexToken(ADDITION,'-',1,6171) +LexToken(NUMBER,'1',1,6172) LexToken(SEMICOLON,';',1,6173) -LexToken(NUMBER,'-1',1,6174) +LexToken(ADDITION,'-',1,6174) +LexToken(NUMBER,'1',1,6175) LexToken(CLOSESQBRACKET,']',1,6176) LexToken(COMMA,',',1,6177) LexToken(VAR,'out2',1,6189) @@ -1542,7 +1546,8 @@ LexToken(DQSTRING,'"output"',1,7238) LexToken(COMMA,',',1,7239) LexToken(VAR,'in',1,7251) LexToken(ASSIGNMENT,'=',1,7253) -LexToken(NUMBER,'-1',1,7254) +LexToken(ADDITION,'-',1,7254) +LexToken(NUMBER,'1',1,7255) LexToken(COMMA,',',1,7256) LexToken(VAR,'in2',1,7268) LexToken(ASSIGNMENT,'=',1,7271) @@ -1551,7 +1556,8 @@ LexToken(CLOSESQBRACKET,']',1,7273) LexToken(COMMA,',',1,7274) LexToken(VAR,'intyp',1,7286) LexToken(ASSIGNMENT,'=',1,7291) -LexToken(NUMBER,'-1',1,7292) +LexToken(ADDITION,'-',1,7292) +LexToken(NUMBER,'1',1,7293) LexToken(COMMA,',',1,7294) LexToken(VAR,'out',1,7306) LexToken(ASSIGNMENT,'=',1,7309) @@ -1824,7 +1830,8 @@ LexToken(NUMBER,'1',1,8405) LexToken(COMMA,',',1,8406) LexToken(VAR,'out',1,8418) LexToken(ASSIGNMENT,'=',1,8421) -LexToken(NUMBER,'-1',1,8422) +LexToken(ADDITION,'-',1,8422) +LexToken(NUMBER,'1',1,8423) LexToken(COMMA,',',1,8424) LexToken(VAR,'out2',1,8436) LexToken(ASSIGNMENT,'=',1,8440) @@ -1833,7 +1840,8 @@ LexToken(CLOSESQBRACKET,']',1,8442) LexToken(COMMA,',',1,8443) LexToken(VAR,'outtyp',1,8455) LexToken(ASSIGNMENT,'=',1,8461) -LexToken(NUMBER,'-1',1,8462) +LexToken(ADDITION,'-',1,8462) +LexToken(NUMBER,'1',1,8463) LexToken(COMMA,',',1,8464) LexToken(VAR,'evtin',1,8476) LexToken(ASSIGNMENT,'=',1,8481) @@ -2092,7 +2100,8 @@ LexToken(NUMBER,'1',1,9524) LexToken(COMMA,',',1,9525) LexToken(VAR,'out',1,9537) LexToken(ASSIGNMENT,'=',1,9540) -LexToken(NUMBER,'-1',1,9541) +LexToken(ADDITION,'-',1,9541) +LexToken(NUMBER,'1',1,9542) LexToken(COMMA,',',1,9543) LexToken(VAR,'out2',1,9555) LexToken(ASSIGNMENT,'=',1,9559) @@ -2101,7 +2110,8 @@ LexToken(CLOSESQBRACKET,']',1,9561) LexToken(COMMA,',',1,9562) LexToken(VAR,'outtyp',1,9574) LexToken(ASSIGNMENT,'=',1,9580) -LexToken(NUMBER,'-1',1,9581) +LexToken(ADDITION,'-',1,9581) +LexToken(NUMBER,'1',1,9582) LexToken(COMMA,',',1,9583) LexToken(VAR,'evtin',1,9595) LexToken(ASSIGNMENT,'=',1,9600) @@ -2346,7 +2356,8 @@ LexToken(DQSTRING,'"output"',1,10590) LexToken(COMMA,',',1,10591) LexToken(VAR,'in',1,10603) LexToken(ASSIGNMENT,'=',1,10605) -LexToken(NUMBER,'-1',1,10606) +LexToken(ADDITION,'-',1,10606) +LexToken(NUMBER,'1',1,10607) LexToken(COMMA,',',1,10608) LexToken(VAR,'in2',1,10620) LexToken(ASSIGNMENT,'=',1,10623) @@ -2355,7 +2366,8 @@ LexToken(CLOSESQBRACKET,']',1,10625) LexToken(COMMA,',',1,10626) LexToken(VAR,'intyp',1,10638) LexToken(ASSIGNMENT,'=',1,10643) -LexToken(NUMBER,'-1',1,10644) +LexToken(ADDITION,'-',1,10644) +LexToken(NUMBER,'1',1,10645) LexToken(COMMA,',',1,10646) LexToken(VAR,'out',1,10658) LexToken(ASSIGNMENT,'=',1,10661) 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) diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index e10f91ba..3b21646e 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -185,8 +185,10 @@ LexToken(EOL,'\n',1,1574) LexToken(VAR,'out',1,1595) LexToken(ASSIGNMENT,'=',1,1598) LexToken(OPENSQBRACKET,'[',1,1599) -LexToken(NUMBER,'-1',1,1600) -LexToken(NUMBER,'-2',1,1603) +LexToken(ADDITION,'-',1,1600) +LexToken(NUMBER,'1',1,1601) +LexToken(ADDITION,'-',1,1603) +LexToken(NUMBER,'2',1,1604) LexToken(CLOSESQBRACKET,']',1,1605) LexToken(EOL,'\n',1,1606) LexToken(ELSEIF,'elseif',1,1623) @@ -205,7 +207,8 @@ LexToken(EOL,'\n',1,1695) LexToken(VAR,'out',1,1716) LexToken(ASSIGNMENT,'=',1,1719) LexToken(OPENSQBRACKET,'[',1,1720) -LexToken(NUMBER,'-1',1,1721) +LexToken(ADDITION,'-',1,1721) +LexToken(NUMBER,'1',1,1722) LexToken(NUMBER,'1',1,1724) LexToken(CLOSESQBRACKET,']',1,1725) LexToken(SEMICOLON,';',1,1726) @@ -227,7 +230,8 @@ LexToken(VAR,'out',1,1837) LexToken(ASSIGNMENT,'=',1,1840) LexToken(OPENSQBRACKET,'[',1,1841) LexToken(NUMBER,'1',1,1842) -LexToken(NUMBER,'-2',1,1844) +LexToken(ADDITION,'-',1,1844) +LexToken(NUMBER,'2',1,1845) LexToken(CLOSESQBRACKET,']',1,1846) LexToken(SEMICOLON,';',1,1847) LexToken(EOL,'\n',1,1848) @@ -492,13 +496,15 @@ LexToken(VAR,'model',1,3262) LexToken(DOT,'.',1,3267) LexToken(VAR,'in',1,3268) LexToken(ASSIGNMENT,'=',1,3270) -LexToken(NUMBER,'-1',1,3271) +LexToken(ADDITION,'-',1,3271) +LexToken(NUMBER,'1',1,3272) LexToken(EOL,'\n',1,3273) LexToken(VAR,'model',1,3282) LexToken(DOT,'.',1,3287) LexToken(VAR,'in2',1,3288) LexToken(ASSIGNMENT,'=',1,3291) -LexToken(NUMBER,'-2',1,3292) +LexToken(ADDITION,'-',1,3292) +LexToken(NUMBER,'2',1,3293) LexToken(EOL,'\n',1,3294) LexToken(VAR,'model',1,3303) LexToken(DOT,'.',1,3308) @@ -510,13 +516,15 @@ LexToken(VAR,'model',1,3325) LexToken(DOT,'.',1,3330) LexToken(VAR,'out',1,3331) LexToken(ASSIGNMENT,'=',1,3334) -LexToken(NUMBER,'-1',1,3335) +LexToken(ADDITION,'-',1,3335) +LexToken(NUMBER,'1',1,3336) LexToken(EOL,'\n',1,3337) LexToken(VAR,'model',1,3346) LexToken(DOT,'.',1,3351) LexToken(VAR,'out2',1,3352) LexToken(ASSIGNMENT,'=',1,3356) -LexToken(NUMBER,'-2',1,3357) +LexToken(ADDITION,'-',1,3357) +LexToken(NUMBER,'2',1,3358) LexToken(EOL,'\n',1,3359) LexToken(VAR,'model',1,3368) LexToken(DOT,'.',1,3373) diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 9a1a4d48..741aa905 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -147,14 +147,16 @@ LexToken(DQSTRING,'"mat"',1,1338) LexToken(COMMA,',',1,1339) LexToken(OPENSQBRACKET,'[',1,1340) LexToken(NUMBER,'1',1,1341) -LexToken(NUMBER,'-1',1,1343) +LexToken(ADDITION,'-',1,1343) +LexToken(NUMBER,'1',1,1344) LexToken(CLOSESQBRACKET,']',1,1345) LexToken(COMMA,',',1,1346) LexToken(DQSTRING,'"mat"',1,1351) LexToken(COMMA,',',1,1352) LexToken(OPENSQBRACKET,'[',1,1353) LexToken(NUMBER,'1',1,1354) -LexToken(NUMBER,'-1',1,1356) +LexToken(ADDITION,'-',1,1356) +LexToken(NUMBER,'1',1,1357) LexToken(CLOSESQBRACKET,']',1,1358) LexToken(CLOSEBRACKET,')',1,1359) LexToken(COMMA,',',1,1360) @@ -526,13 +528,15 @@ LexToken(VAR,'model',1,2975) LexToken(DOT,'.',1,2980) LexToken(VAR,'in',1,2981) LexToken(ASSIGNMENT,'=',1,2983) -LexToken(NUMBER,'-1',1,2984) +LexToken(ADDITION,'-',1,2984) +LexToken(NUMBER,'1',1,2985) LexToken(EOL,'\n',1,2986) LexToken(VAR,'model',1,2995) LexToken(DOT,'.',1,3000) LexToken(VAR,'in2',1,3001) LexToken(ASSIGNMENT,'=',1,3004) -LexToken(NUMBER,'-2',1,3005) +LexToken(ADDITION,'-',1,3005) +LexToken(NUMBER,'2',1,3006) LexToken(EOL,'\n',1,3007) LexToken(VAR,'model',1,3016) LexToken(DOT,'.',1,3021) diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 1ad71cf0..34dc8ea4 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -468,13 +468,15 @@ LexToken(VAR,'model',1,3138) LexToken(DOT,'.',1,3143) LexToken(VAR,'in',1,3144) LexToken(ASSIGNMENT,'=',1,3146) -LexToken(NUMBER,'-1',1,3147) +LexToken(ADDITION,'-',1,3147) +LexToken(NUMBER,'1',1,3148) LexToken(EOL,'\n',1,3149) LexToken(VAR,'model',1,3158) LexToken(DOT,'.',1,3163) LexToken(VAR,'in2',1,3164) LexToken(ASSIGNMENT,'=',1,3167) -LexToken(NUMBER,'-2',1,3168) +LexToken(ADDITION,'-',1,3168) +LexToken(NUMBER,'2',1,3169) LexToken(EOL,'\n',1,3170) LexToken(VAR,'model',1,3179) LexToken(DOT,'.',1,3184) @@ -486,13 +488,15 @@ LexToken(VAR,'model',1,3201) LexToken(DOT,'.',1,3206) LexToken(VAR,'out',1,3207) LexToken(ASSIGNMENT,'=',1,3210) -LexToken(NUMBER,'-1',1,3211) +LexToken(ADDITION,'-',1,3211) +LexToken(NUMBER,'1',1,3212) LexToken(EOL,'\n',1,3213) LexToken(VAR,'model',1,3222) LexToken(DOT,'.',1,3227) LexToken(VAR,'out2',1,3228) LexToken(ASSIGNMENT,'=',1,3232) -LexToken(NUMBER,'-2',1,3233) +LexToken(ADDITION,'-',1,3233) +LexToken(NUMBER,'2',1,3234) LexToken(EOL,'\n',1,3235) LexToken(VAR,'model',1,3244) LexToken(DOT,'.',1,3249) diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 72a8c88a..ab618ece 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -368,9 +368,11 @@ LexToken(DOT,'.',1,2356) LexToken(VAR,'in',1,2357) LexToken(ASSIGNMENT,'=',1,2359) LexToken(OPENSQBRACKET,'[',1,2360) -LexToken(NUMBER,'-1',1,2361) +LexToken(ADDITION,'-',1,2361) +LexToken(NUMBER,'1',1,2362) LexToken(SEMICOLON,';',1,2363) -LexToken(NUMBER,'-1',1,2364) +LexToken(ADDITION,'-',1,2364) +LexToken(NUMBER,'1',1,2365) LexToken(CLOSESQBRACKET,']',1,2366) LexToken(EOL,'\n',1,2367) LexToken(VAR,'model',1,2376) @@ -378,9 +380,11 @@ LexToken(DOT,'.',1,2381) LexToken(VAR,'in2',1,2382) LexToken(ASSIGNMENT,'=',1,2385) LexToken(OPENSQBRACKET,'[',1,2386) -LexToken(NUMBER,'-2',1,2387) +LexToken(ADDITION,'-',1,2387) +LexToken(NUMBER,'2',1,2388) LexToken(SEMICOLON,';',1,2389) -LexToken(NUMBER,'-3',1,2390) +LexToken(ADDITION,'-',1,2390) +LexToken(NUMBER,'3',1,2391) LexToken(CLOSESQBRACKET,']',1,2392) LexToken(EOL,'\n',1,2393) LexToken(VAR,'model',1,2402) @@ -396,13 +400,15 @@ LexToken(VAR,'model',1,2428) LexToken(DOT,'.',1,2433) LexToken(VAR,'out',1,2434) LexToken(ASSIGNMENT,'=',1,2437) -LexToken(NUMBER,'-2',1,2438) +LexToken(ADDITION,'-',1,2438) +LexToken(NUMBER,'2',1,2439) LexToken(EOL,'\n',1,2440) LexToken(VAR,'model',1,2449) LexToken(DOT,'.',1,2454) LexToken(VAR,'out2',1,2455) LexToken(ASSIGNMENT,'=',1,2459) -LexToken(NUMBER,'-3',1,2460) +LexToken(ADDITION,'-',1,2460) +LexToken(NUMBER,'3',1,2461) LexToken(EOL,'\n',1,2462) LexToken(VAR,'model',1,2471) LexToken(DOT,'.',1,2476) diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index d3816800..e73cd74b 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -100,12 +100,12 @@ LexToken(EOL,'\n',1,1093) LexToken(VAR,'label',1,1106) LexToken(ASSIGNMENT,'=',1,1111) LexToken(DQSTRING,'"size(evstr("',1,1124) -LexToken(OPERATOR,'+',1,1125) +LexToken(ADDITION,'+',1,1125) LexToken(VAR,'label',1,1126) LexToken(OPENBRACKET,'(',1,1131) LexToken(NUMBER,'2',1,1132) LexToken(CLOSEBRACKET,')',1,1133) -LexToken(OPERATOR,'+',1,1134) +LexToken(ADDITION,'+',1,1134) LexToken(DQSTRING,'"),\\\'*\\\')"',1,1144) LexToken(SEMICOLON,';',1,1145) LexToken(EOL,'\n',1,1146) @@ -159,8 +159,9 @@ LexToken(EOL,'\n',1,1422) LexToken(VAR,'in',1,1435) LexToken(ASSIGNMENT,'=',1,1437) LexToken(OPENSQBRACKET,'[',1,1438) -LexToken(NUMBER,'-1',1,1439) -LexToken(OPERATOR,'*',1,1441) +LexToken(ADDITION,'-',1,1439) +LexToken(NUMBER,'1',1,1440) +LexToken(MULTIPLICATION,'*',1,1441) LexToken(OPENBRACKET,'(',1,1442) LexToken(VAR,'ones',1,1443) LexToken(OPENBRACKET,'(',1,1447) @@ -169,13 +170,13 @@ LexToken(COMMA,',',1,1451) LexToken(NUMBER,'1',1,1452) LexToken(CLOSEBRACKET,')',1,1453) LexToken(CLOSEBRACKET,')',1,1454) -LexToken(OPERATOR,'-',1,1456) +LexToken(ADDITION,'-',1,1456) LexToken(OPENBRACKET,'(',1,1457) LexToken(OPENSQBRACKET,'[',1,1458) LexToken(NUMBER,'2',1,1459) LexToken(COLON,':',1,1460) LexToken(VAR,'nin',1,1461) -LexToken(OPERATOR,'+',1,1464) +LexToken(ADDITION,'+',1,1464) LexToken(NUMBER,'1',1,1465) LexToken(CLOSESQBRACKET,']',1,1466) LexToken(TRANSPOSE,"'",1,1467) @@ -186,14 +187,16 @@ LexToken(EOL,'\n',1,1471) LexToken(VAR,'out',1,1484) LexToken(ASSIGNMENT,'=',1,1487) LexToken(OPENSQBRACKET,'[',1,1488) -LexToken(NUMBER,'-1',1,1489) +LexToken(ADDITION,'-',1,1489) +LexToken(NUMBER,'1',1,1490) LexToken(NUMBER,'0',1,1492) LexToken(CLOSESQBRACKET,']',1,1493) LexToken(EOL,'\n',1,1494) LexToken(VAR,'it',1,1507) LexToken(ASSIGNMENT,'=',1,1509) -LexToken(NUMBER,'-1',1,1510) -LexToken(OPERATOR,'*',1,1512) +LexToken(ADDITION,'-',1,1510) +LexToken(NUMBER,'1',1,1511) +LexToken(MULTIPLICATION,'*',1,1512) LexToken(OPENBRACKET,'(',1,1513) LexToken(VAR,'ones',1,1514) LexToken(OPENBRACKET,'(',1,1518) @@ -206,7 +209,8 @@ LexToken(SEMICOLON,';',1,1526) LexToken(EOL,'\n',1,1527) LexToken(VAR,'ot',1,1540) LexToken(ASSIGNMENT,'=',1,1542) -LexToken(NUMBER,'-1',1,1543) +LexToken(ADDITION,'-',1,1543) +LexToken(NUMBER,'1',1,1544) LexToken(SEMICOLON,';',1,1545) LexToken(EOL,'\n',1,1546) LexToken(OPENSQBRACKET,'[',1,1559) @@ -328,9 +332,11 @@ LexToken(DOT,'.',1,2076) LexToken(VAR,'in',1,2077) LexToken(ASSIGNMENT,'=',1,2079) LexToken(OPENSQBRACKET,'[',1,2080) -LexToken(NUMBER,'-1',1,2081) +LexToken(ADDITION,'-',1,2081) +LexToken(NUMBER,'1',1,2082) LexToken(SEMICOLON,';',1,2083) -LexToken(NUMBER,'-1',1,2084) +LexToken(ADDITION,'-',1,2084) +LexToken(NUMBER,'1',1,2085) LexToken(CLOSESQBRACKET,']',1,2086) LexToken(EOL,'\n',1,2087) LexToken(VAR,'model',1,2096) @@ -338,9 +344,11 @@ LexToken(DOT,'.',1,2101) LexToken(VAR,'in2',1,2102) LexToken(ASSIGNMENT,'=',1,2105) LexToken(OPENSQBRACKET,'[',1,2106) -LexToken(NUMBER,'-2',1,2107) +LexToken(ADDITION,'-',1,2107) +LexToken(NUMBER,'2',1,2108) LexToken(SEMICOLON,';',1,2109) -LexToken(NUMBER,'-3',1,2110) +LexToken(ADDITION,'-',1,2110) +LexToken(NUMBER,'3',1,2111) LexToken(CLOSESQBRACKET,']',1,2112) LexToken(EOL,'\n',1,2113) LexToken(VAR,'model',1,2122) @@ -356,7 +364,8 @@ LexToken(VAR,'model',1,2148) LexToken(DOT,'.',1,2153) LexToken(VAR,'out',1,2154) LexToken(ASSIGNMENT,'=',1,2157) -LexToken(NUMBER,'-1',1,2158) +LexToken(ADDITION,'-',1,2158) +LexToken(NUMBER,'1',1,2159) LexToken(EOL,'\n',1,2160) LexToken(VAR,'model',1,2169) LexToken(DOT,'.',1,2174) @@ -368,7 +377,8 @@ LexToken(VAR,'model',1,2190) LexToken(DOT,'.',1,2195) LexToken(VAR,'outtyp',1,2196) LexToken(ASSIGNMENT,'=',1,2202) -LexToken(NUMBER,'-1',1,2203) +LexToken(ADDITION,'-',1,2203) +LexToken(NUMBER,'1',1,2204) LexToken(EOL,'\n',1,2205) LexToken(VAR,'model',1,2214) LexToken(DOT,'.',1,2219) diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 5fb35026..2fb7d456 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -100,12 +100,12 @@ LexToken(EOL,'\n',1,1095) LexToken(VAR,'label',1,1108) LexToken(ASSIGNMENT,'=',1,1113) LexToken(DQSTRING,'"size(evstr("',1,1126) -LexToken(OPERATOR,'+',1,1127) +LexToken(ADDITION,'+',1,1127) LexToken(VAR,'label',1,1128) LexToken(OPENBRACKET,'(',1,1133) LexToken(NUMBER,'2',1,1134) LexToken(CLOSEBRACKET,')',1,1135) -LexToken(OPERATOR,'+',1,1136) +LexToken(ADDITION,'+',1,1136) LexToken(DQSTRING,'"),\\\'*\\\')"',1,1146) LexToken(SEMICOLON,';',1,1147) LexToken(EOL,'\n',1,1148) @@ -158,18 +158,18 @@ LexToken(EOL,'\n',1,1424) LexToken(VAR,'in',1,1437) LexToken(ASSIGNMENT,'=',1,1439) LexToken(OPENSQBRACKET,'[',1,1440) -LexToken(OPERATOR,'-',1,1441) +LexToken(ADDITION,'-',1,1441) LexToken(OPENBRACKET,'(',1,1442) LexToken(OPENSQBRACKET,'[',1,1443) LexToken(NUMBER,'2',1,1444) LexToken(COLON,':',1,1445) LexToken(VAR,'nin',1,1446) -LexToken(OPERATOR,'+',1,1449) +LexToken(ADDITION,'+',1,1449) LexToken(NUMBER,'1',1,1450) LexToken(CLOSESQBRACKET,']',1,1451) LexToken(TRANSPOSE,"'",1,1452) LexToken(CLOSEBRACKET,')',1,1453) -LexToken(OPERATOR,'-',1,1455) +LexToken(ADDITION,'-',1,1455) LexToken(VAR,'ones',1,1456) LexToken(OPENBRACKET,'(',1,1460) LexToken(VAR,'nin',1,1461) @@ -180,7 +180,7 @@ LexToken(CLOSESQBRACKET,']',1,1467) LexToken(EOL,'\n',1,1468) LexToken(VAR,'it',1,1481) LexToken(ASSIGNMENT,'=',1,1483) -LexToken(OPERATOR,'-',1,1485) +LexToken(ADDITION,'-',1,1485) LexToken(VAR,'ones',1,1486) LexToken(OPENBRACKET,'(',1,1490) LexToken(VAR,'nin',1,1491) @@ -191,14 +191,16 @@ LexToken(SEMICOLON,';',1,1497) LexToken(EOL,'\n',1,1498) LexToken(VAR,'ot',1,1511) LexToken(ASSIGNMENT,'=',1,1513) -LexToken(NUMBER,'-1',1,1514) +LexToken(ADDITION,'-',1,1514) +LexToken(NUMBER,'1',1,1515) LexToken(SEMICOLON,';',1,1516) LexToken(EOL,'\n',1,1517) LexToken(VAR,'out',1,1530) LexToken(ASSIGNMENT,'=',1,1533) LexToken(OPENSQBRACKET,'[',1,1534) LexToken(NUMBER,'0',1,1535) -LexToken(NUMBER,'-1',1,1537) +LexToken(ADDITION,'-',1,1537) +LexToken(NUMBER,'1',1,1538) LexToken(CLOSESQBRACKET,']',1,1539) LexToken(EOL,'\n',1,1540) LexToken(OPENSQBRACKET,'[',1,1553) @@ -328,9 +330,11 @@ LexToken(DOT,'.',1,2087) LexToken(VAR,'in2',1,2088) LexToken(ASSIGNMENT,'=',1,2091) LexToken(OPENSQBRACKET,'[',1,2092) -LexToken(NUMBER,'-1',1,2093) +LexToken(ADDITION,'-',1,2093) +LexToken(NUMBER,'1',1,2094) LexToken(SEMICOLON,';',1,2095) -LexToken(NUMBER,'-1',1,2096) +LexToken(ADDITION,'-',1,2096) +LexToken(NUMBER,'1',1,2097) LexToken(CLOSESQBRACKET,']',1,2098) LexToken(EOL,'\n',1,2099) LexToken(VAR,'model',1,2108) @@ -338,9 +342,11 @@ LexToken(DOT,'.',1,2113) LexToken(VAR,'in',1,2114) LexToken(ASSIGNMENT,'=',1,2116) LexToken(OPENSQBRACKET,'[',1,2117) -LexToken(NUMBER,'-2',1,2118) +LexToken(ADDITION,'-',1,2118) +LexToken(NUMBER,'2',1,2119) LexToken(SEMICOLON,';',1,2120) -LexToken(NUMBER,'-3',1,2121) +LexToken(ADDITION,'-',1,2121) +LexToken(NUMBER,'3',1,2122) LexToken(CLOSESQBRACKET,']',1,2123) LexToken(EOL,'\n',1,2124) LexToken(VAR,'model',1,2133) @@ -348,8 +354,10 @@ LexToken(DOT,'.',1,2138) LexToken(VAR,'intyp',1,2139) LexToken(ASSIGNMENT,'=',1,2144) LexToken(OPENSQBRACKET,'[',1,2145) -LexToken(NUMBER,'-1',1,2146) -LexToken(NUMBER,'-1',1,2149) +LexToken(ADDITION,'-',1,2146) +LexToken(NUMBER,'1',1,2147) +LexToken(ADDITION,'-',1,2149) +LexToken(NUMBER,'1',1,2150) LexToken(CLOSESQBRACKET,']',1,2151) LexToken(EOL,'\n',1,2152) LexToken(VAR,'model',1,2161) @@ -362,13 +370,15 @@ LexToken(VAR,'model',1,2181) LexToken(DOT,'.',1,2186) LexToken(VAR,'out2',1,2187) LexToken(ASSIGNMENT,'=',1,2191) -LexToken(NUMBER,'-1',1,2192) +LexToken(ADDITION,'-',1,2192) +LexToken(NUMBER,'1',1,2193) LexToken(EOL,'\n',1,2194) LexToken(VAR,'model',1,2203) LexToken(DOT,'.',1,2208) LexToken(VAR,'outtyp',1,2209) LexToken(ASSIGNMENT,'=',1,2215) -LexToken(NUMBER,'-1',1,2216) +LexToken(ADDITION,'-',1,2216) +LexToken(NUMBER,'1',1,2217) LexToken(EOL,'\n',1,2218) LexToken(VAR,'model',1,2227) LexToken(DOT,'.',1,2232) diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 006717a0..4716f0a8 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -362,13 +362,15 @@ LexToken(VAR,'model',1,2338) LexToken(DOT,'.',1,2343) LexToken(VAR,'in',1,2344) LexToken(ASSIGNMENT,'=',1,2346) -LexToken(NUMBER,'-1',1,2347) +LexToken(ADDITION,'-',1,2347) +LexToken(NUMBER,'1',1,2348) LexToken(EOL,'\n',1,2349) LexToken(VAR,'model',1,2358) LexToken(DOT,'.',1,2363) LexToken(VAR,'in2',1,2364) LexToken(ASSIGNMENT,'=',1,2367) -LexToken(NUMBER,'-1',1,2368) +LexToken(ADDITION,'-',1,2368) +LexToken(NUMBER,'1',1,2369) LexToken(EOL,'\n',1,2370) LexToken(VAR,'model',1,2379) LexToken(DOT,'.',1,2384) diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 10af0799..47f3bea5 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -362,7 +362,8 @@ LexToken(VAR,'model',1,2344) LexToken(DOT,'.',1,2349) LexToken(VAR,'in',1,2350) LexToken(ASSIGNMENT,'=',1,2352) -LexToken(NUMBER,'-1',1,2353) +LexToken(ADDITION,'-',1,2353) +LexToken(NUMBER,'1',1,2354) LexToken(EOL,'\n',1,2355) LexToken(VAR,'model',1,2364) LexToken(DOT,'.',1,2369) @@ -380,13 +381,15 @@ LexToken(VAR,'model',1,2406) LexToken(DOT,'.',1,2411) LexToken(VAR,'out',1,2412) LexToken(ASSIGNMENT,'=',1,2415) -LexToken(NUMBER,'-1',1,2416) +LexToken(ADDITION,'-',1,2416) +LexToken(NUMBER,'1',1,2417) LexToken(EOL,'\n',1,2418) LexToken(VAR,'model',1,2427) LexToken(DOT,'.',1,2432) LexToken(VAR,'out2',1,2433) LexToken(ASSIGNMENT,'=',1,2437) -LexToken(NUMBER,'-1',1,2438) +LexToken(ADDITION,'-',1,2438) +LexToken(NUMBER,'1',1,2439) LexToken(EOL,'\n',1,2440) LexToken(VAR,'model',1,2449) LexToken(DOT,'.',1,2454) diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index a59e7eb7..0ff51090 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -368,9 +368,11 @@ LexToken(DOT,'.',1,2350) LexToken(VAR,'in',1,2351) LexToken(ASSIGNMENT,'=',1,2353) LexToken(OPENSQBRACKET,'[',1,2354) -LexToken(NUMBER,'-1',1,2355) +LexToken(ADDITION,'-',1,2355) +LexToken(NUMBER,'1',1,2356) LexToken(SEMICOLON,';',1,2357) -LexToken(NUMBER,'-2',1,2358) +LexToken(ADDITION,'-',1,2358) +LexToken(NUMBER,'2',1,2359) LexToken(CLOSESQBRACKET,']',1,2360) LexToken(EOL,'\n',1,2361) LexToken(VAR,'model',1,2370) @@ -378,9 +380,11 @@ LexToken(DOT,'.',1,2375) LexToken(VAR,'in2',1,2376) LexToken(ASSIGNMENT,'=',1,2379) LexToken(OPENSQBRACKET,'[',1,2380) -LexToken(NUMBER,'-3',1,2381) +LexToken(ADDITION,'-',1,2381) +LexToken(NUMBER,'3',1,2382) LexToken(SEMICOLON,';',1,2383) -LexToken(NUMBER,'-3',1,2384) +LexToken(ADDITION,'-',1,2384) +LexToken(NUMBER,'3',1,2385) LexToken(CLOSESQBRACKET,']',1,2386) LexToken(EOL,'\n',1,2387) LexToken(VAR,'model',1,2396) @@ -396,13 +400,15 @@ LexToken(VAR,'model',1,2422) LexToken(DOT,'.',1,2427) LexToken(VAR,'out',1,2428) LexToken(ASSIGNMENT,'=',1,2431) -LexToken(NUMBER,'-1',1,2432) +LexToken(ADDITION,'-',1,2432) +LexToken(NUMBER,'1',1,2433) LexToken(EOL,'\n',1,2434) LexToken(VAR,'model',1,2443) LexToken(DOT,'.',1,2448) LexToken(VAR,'out2',1,2449) LexToken(ASSIGNMENT,'=',1,2453) -LexToken(NUMBER,'-2',1,2454) +LexToken(ADDITION,'-',1,2454) +LexToken(NUMBER,'2',1,2455) LexToken(EOL,'\n',1,2456) LexToken(VAR,'model',1,2465) LexToken(DOT,'.',1,2470) diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 1a0c918f..b20766ba 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -185,7 +185,8 @@ LexToken(EOL,'\n',1,1565) LexToken(VAR,'out',1,1586) LexToken(ASSIGNMENT,'=',1,1589) LexToken(OPENSQBRACKET,'[',1,1590) -LexToken(NUMBER,'-1',1,1591) +LexToken(ADDITION,'-',1,1591) +LexToken(NUMBER,'1',1,1592) LexToken(NUMBER,'1',1,1594) LexToken(CLOSESQBRACKET,']',1,1595) LexToken(SEMICOLON,';',1,1596) @@ -211,11 +212,15 @@ LexToken(EOL,'\n',1,1711) LexToken(VAR,'out',1,1732) LexToken(ASSIGNMENT,'=',1,1735) LexToken(OPENSQBRACKET,'[',1,1736) -LexToken(NUMBER,'-1',1,1737) -LexToken(NUMBER,'-1',1,1740) +LexToken(ADDITION,'-',1,1737) +LexToken(NUMBER,'1',1,1738) +LexToken(ADDITION,'-',1,1740) +LexToken(NUMBER,'1',1,1741) LexToken(SEMICOLON,';',1,1742) -LexToken(NUMBER,'-1',1,1743) -LexToken(NUMBER,'-1',1,1746) +LexToken(ADDITION,'-',1,1743) +LexToken(NUMBER,'1',1,1744) +LexToken(ADDITION,'-',1,1746) +LexToken(NUMBER,'1',1,1747) LexToken(CLOSESQBRACKET,']',1,1748) LexToken(SEMICOLON,';',1,1749) LexToken(EOL,'\n',1,1750) @@ -271,7 +276,8 @@ LexToken(EOL,'\n',1,2056) LexToken(VAR,'out',1,2077) LexToken(ASSIGNMENT,'=',1,2080) LexToken(OPENSQBRACKET,'[',1,2081) -LexToken(NUMBER,'-1',1,2082) +LexToken(ADDITION,'-',1,2082) +LexToken(NUMBER,'1',1,2083) LexToken(NUMBER,'1',1,2085) LexToken(CLOSESQBRACKET,']',1,2086) LexToken(SEMICOLON,';',1,2087) @@ -297,11 +303,15 @@ LexToken(EOL,'\n',1,2203) LexToken(VAR,'out',1,2224) LexToken(ASSIGNMENT,'=',1,2227) LexToken(OPENSQBRACKET,'[',1,2228) -LexToken(NUMBER,'-1',1,2229) -LexToken(NUMBER,'-1',1,2232) +LexToken(ADDITION,'-',1,2229) +LexToken(NUMBER,'1',1,2230) +LexToken(ADDITION,'-',1,2232) +LexToken(NUMBER,'1',1,2233) LexToken(SEMICOLON,';',1,2234) -LexToken(NUMBER,'-1',1,2235) -LexToken(NUMBER,'-1',1,2238) +LexToken(ADDITION,'-',1,2235) +LexToken(NUMBER,'1',1,2236) +LexToken(ADDITION,'-',1,2238) +LexToken(NUMBER,'1',1,2239) LexToken(CLOSESQBRACKET,']',1,2240) LexToken(SEMICOLON,';',1,2241) LexToken(EOL,'\n',1,2242) @@ -351,8 +361,10 @@ LexToken(EOL,'\n',1,2540) LexToken(VAR,'in',1,2553) LexToken(ASSIGNMENT,'=',1,2555) LexToken(OPENSQBRACKET,'[',1,2556) -LexToken(NUMBER,'-1',1,2557) -LexToken(NUMBER,'-1',1,2560) +LexToken(ADDITION,'-',1,2557) +LexToken(NUMBER,'1',1,2558) +LexToken(ADDITION,'-',1,2560) +LexToken(NUMBER,'1',1,2561) LexToken(CLOSESQBRACKET,']',1,2562) LexToken(SEMICOLON,';',1,2563) LexToken(EOL,'\n',1,2564) @@ -482,13 +494,15 @@ LexToken(VAR,'model',1,3132) LexToken(DOT,'.',1,3137) LexToken(VAR,'in',1,3138) LexToken(ASSIGNMENT,'=',1,3140) -LexToken(NUMBER,'-1',1,3141) +LexToken(ADDITION,'-',1,3141) +LexToken(NUMBER,'1',1,3142) LexToken(EOL,'\n',1,3143) LexToken(VAR,'model',1,3152) LexToken(DOT,'.',1,3157) LexToken(VAR,'in2',1,3158) LexToken(ASSIGNMENT,'=',1,3161) -LexToken(NUMBER,'-1',1,3162) +LexToken(ADDITION,'-',1,3162) +LexToken(NUMBER,'1',1,3163) LexToken(EOL,'\n',1,3164) LexToken(VAR,'model',1,3173) LexToken(DOT,'.',1,3178) @@ -500,7 +514,8 @@ LexToken(VAR,'model',1,3195) LexToken(DOT,'.',1,3200) LexToken(VAR,'out',1,3201) LexToken(ASSIGNMENT,'=',1,3204) -LexToken(NUMBER,'-1',1,3205) +LexToken(ADDITION,'-',1,3205) +LexToken(NUMBER,'1',1,3206) LexToken(EOL,'\n',1,3207) LexToken(VAR,'model',1,3216) LexToken(DOT,'.',1,3221) diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 0b9454cb..95d9d454 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -361,13 +361,15 @@ LexToken(VAR,'model',1,2323) LexToken(DOT,'.',1,2328) LexToken(VAR,'in',1,2329) LexToken(ASSIGNMENT,'=',1,2331) -LexToken(NUMBER,'-1',1,2332) +LexToken(ADDITION,'-',1,2332) +LexToken(NUMBER,'1',1,2333) LexToken(EOL,'\n',1,2334) LexToken(VAR,'model',1,2343) LexToken(DOT,'.',1,2348) LexToken(VAR,'in2',1,2349) LexToken(ASSIGNMENT,'=',1,2352) -LexToken(NUMBER,'-1',1,2353) +LexToken(ADDITION,'-',1,2353) +LexToken(NUMBER,'1',1,2354) LexToken(EOL,'\n',1,2355) LexToken(VAR,'model',1,2364) LexToken(DOT,'.',1,2369) @@ -379,13 +381,15 @@ LexToken(VAR,'model',1,2386) LexToken(DOT,'.',1,2391) LexToken(VAR,'out',1,2392) LexToken(ASSIGNMENT,'=',1,2395) -LexToken(NUMBER,'-1',1,2396) +LexToken(ADDITION,'-',1,2396) +LexToken(NUMBER,'1',1,2397) LexToken(EOL,'\n',1,2398) LexToken(VAR,'model',1,2407) LexToken(DOT,'.',1,2412) LexToken(VAR,'out2',1,2413) LexToken(ASSIGNMENT,'=',1,2417) -LexToken(NUMBER,'-1',1,2418) +LexToken(ADDITION,'-',1,2418) +LexToken(NUMBER,'1',1,2419) LexToken(EOL,'\n',1,2420) LexToken(VAR,'model',1,2429) LexToken(DOT,'.',1,2434) diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index f086f37b..0dfe4a93 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -362,13 +362,15 @@ LexToken(VAR,'model',1,2338) LexToken(DOT,'.',1,2343) LexToken(VAR,'in',1,2344) LexToken(ASSIGNMENT,'=',1,2346) -LexToken(NUMBER,'-1',1,2347) +LexToken(ADDITION,'-',1,2347) +LexToken(NUMBER,'1',1,2348) LexToken(EOL,'\n',1,2349) LexToken(VAR,'model',1,2358) LexToken(DOT,'.',1,2363) LexToken(VAR,'in2',1,2364) LexToken(ASSIGNMENT,'=',1,2367) -LexToken(NUMBER,'-1',1,2368) +LexToken(ADDITION,'-',1,2368) +LexToken(NUMBER,'1',1,2369) LexToken(EOL,'\n',1,2370) LexToken(VAR,'model',1,2379) LexToken(DOT,'.',1,2384) @@ -380,13 +382,15 @@ LexToken(VAR,'model',1,2401) LexToken(DOT,'.',1,2406) LexToken(VAR,'out',1,2407) LexToken(ASSIGNMENT,'=',1,2410) -LexToken(NUMBER,'-1',1,2411) +LexToken(ADDITION,'-',1,2411) +LexToken(NUMBER,'1',1,2412) LexToken(EOL,'\n',1,2413) LexToken(VAR,'model',1,2422) LexToken(DOT,'.',1,2427) LexToken(VAR,'out2',1,2428) LexToken(ASSIGNMENT,'=',1,2432) -LexToken(NUMBER,'-1',1,2433) +LexToken(ADDITION,'-',1,2433) +LexToken(NUMBER,'1',1,2434) LexToken(EOL,'\n',1,2435) LexToken(VAR,'model',1,2444) LexToken(DOT,'.',1,2449) diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 2b58fee2..84f12c18 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -354,13 +354,15 @@ LexToken(VAR,'model',1,2292) LexToken(DOT,'.',1,2297) LexToken(VAR,'in',1,2298) LexToken(ASSIGNMENT,'=',1,2300) -LexToken(NUMBER,'-1',1,2301) +LexToken(ADDITION,'-',1,2301) +LexToken(NUMBER,'1',1,2302) LexToken(EOL,'\n',1,2303) LexToken(VAR,'model',1,2312) LexToken(DOT,'.',1,2317) LexToken(VAR,'in2',1,2318) LexToken(ASSIGNMENT,'=',1,2321) -LexToken(NUMBER,'-1',1,2322) +LexToken(ADDITION,'-',1,2322) +LexToken(NUMBER,'1',1,2323) LexToken(EOL,'\n',1,2324) LexToken(VAR,'model',1,2333) LexToken(DOT,'.',1,2338) @@ -375,9 +377,11 @@ LexToken(DOT,'.',1,2437) LexToken(VAR,'out',1,2438) LexToken(ASSIGNMENT,'=',1,2441) LexToken(OPENSQBRACKET,'[',1,2442) -LexToken(NUMBER,'-1',1,2443) +LexToken(ADDITION,'-',1,2443) +LexToken(NUMBER,'1',1,2444) LexToken(SEMICOLON,';',1,2445) -LexToken(NUMBER,'-1',1,2446) +LexToken(ADDITION,'-',1,2446) +LexToken(NUMBER,'1',1,2447) LexToken(CLOSESQBRACKET,']',1,2448) LexToken(EOL,'\n',1,2449) LexToken(VAR,'model',1,2458) @@ -385,9 +389,11 @@ LexToken(DOT,'.',1,2463) LexToken(VAR,'out2',1,2464) LexToken(ASSIGNMENT,'=',1,2468) LexToken(OPENSQBRACKET,'[',1,2469) -LexToken(NUMBER,'-1',1,2470) +LexToken(ADDITION,'-',1,2470) +LexToken(NUMBER,'1',1,2471) LexToken(SEMICOLON,';',1,2472) -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) diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 3311a7b6..08bbc042 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -169,8 +169,10 @@ LexToken(EOL,'\n',1,1484) LexToken(VAR,'in',1,1501) LexToken(ASSIGNMENT,'=',1,1503) LexToken(OPENSQBRACKET,'[',1,1504) -LexToken(NUMBER,'-1',1,1505) -LexToken(NUMBER,'-2',1,1508) +LexToken(ADDITION,'-',1,1505) +LexToken(NUMBER,'1',1,1506) +LexToken(ADDITION,'-',1,1508) +LexToken(NUMBER,'2',1,1509) LexToken(CLOSESQBRACKET,']',1,1510) LexToken(SEMICOLON,';',1,1511) LexToken(EOL,'\n',1,1512) @@ -182,11 +184,15 @@ LexToken(EOL,'\n',1,1534) LexToken(VAR,'out',1,1551) LexToken(ASSIGNMENT,'=',1,1554) LexToken(OPENSQBRACKET,'[',1,1555) -LexToken(NUMBER,'-1',1,1556) -LexToken(NUMBER,'-2',1,1559) +LexToken(ADDITION,'-',1,1556) +LexToken(NUMBER,'1',1,1557) +LexToken(ADDITION,'-',1,1559) +LexToken(NUMBER,'2',1,1560) LexToken(SEMICOLON,';',1,1561) -LexToken(NUMBER,'-1',1,1562) -LexToken(NUMBER,'-2',1,1565) +LexToken(ADDITION,'-',1,1562) +LexToken(NUMBER,'1',1,1563) +LexToken(ADDITION,'-',1,1565) +LexToken(NUMBER,'2',1,1566) LexToken(CLOSESQBRACKET,']',1,1567) LexToken(SEMICOLON,';',1,1568) LexToken(EOL,'\n',1,1569) @@ -214,11 +220,15 @@ LexToken(EOL,'\n',1,1677) LexToken(VAR,'in',1,1694) LexToken(ASSIGNMENT,'=',1,1696) LexToken(OPENSQBRACKET,'[',1,1697) -LexToken(NUMBER,'-1',1,1698) -LexToken(NUMBER,'-2',1,1701) +LexToken(ADDITION,'-',1,1698) +LexToken(NUMBER,'1',1,1699) +LexToken(ADDITION,'-',1,1701) +LexToken(NUMBER,'2',1,1702) LexToken(SEMICOLON,';',1,1703) -LexToken(NUMBER,'-1',1,1704) -LexToken(NUMBER,'-2',1,1707) +LexToken(ADDITION,'-',1,1704) +LexToken(NUMBER,'1',1,1705) +LexToken(ADDITION,'-',1,1707) +LexToken(NUMBER,'2',1,1708) LexToken(CLOSESQBRACKET,']',1,1709) LexToken(SEMICOLON,';',1,1710) LexToken(EOL,'\n',1,1711) @@ -233,8 +243,10 @@ LexToken(EOL,'\n',1,1737) LexToken(VAR,'out',1,1754) LexToken(ASSIGNMENT,'=',1,1757) LexToken(OPENSQBRACKET,'[',1,1758) -LexToken(NUMBER,'-1',1,1759) -LexToken(NUMBER,'-2',1,1762) +LexToken(ADDITION,'-',1,1759) +LexToken(NUMBER,'1',1,1760) +LexToken(ADDITION,'-',1,1762) +LexToken(NUMBER,'2',1,1763) LexToken(CLOSESQBRACKET,']',1,1764) LexToken(SEMICOLON,';',1,1765) LexToken(EOL,'\n',1,1766) @@ -383,13 +395,15 @@ LexToken(VAR,'model',1,2476) LexToken(DOT,'.',1,2481) LexToken(VAR,'in',1,2482) LexToken(ASSIGNMENT,'=',1,2484) -LexToken(NUMBER,'-1',1,2485) +LexToken(ADDITION,'-',1,2485) +LexToken(NUMBER,'1',1,2486) LexToken(EOL,'\n',1,2487) LexToken(VAR,'model',1,2496) LexToken(DOT,'.',1,2501) LexToken(VAR,'in2',1,2502) LexToken(ASSIGNMENT,'=',1,2505) -LexToken(NUMBER,'-2',1,2506) +LexToken(ADDITION,'-',1,2506) +LexToken(NUMBER,'2',1,2507) LexToken(EOL,'\n',1,2508) LexToken(VAR,'model',1,2517) LexToken(DOT,'.',1,2522) @@ -402,9 +416,11 @@ LexToken(DOT,'.',1,2544) LexToken(VAR,'out',1,2545) LexToken(ASSIGNMENT,'=',1,2548) LexToken(OPENSQBRACKET,'[',1,2549) -LexToken(NUMBER,'-1',1,2550) +LexToken(ADDITION,'-',1,2550) +LexToken(NUMBER,'1',1,2551) LexToken(SEMICOLON,';',1,2552) -LexToken(NUMBER,'-1',1,2553) +LexToken(ADDITION,'-',1,2553) +LexToken(NUMBER,'1',1,2554) LexToken(CLOSESQBRACKET,']',1,2555) LexToken(EOL,'\n',1,2556) LexToken(VAR,'model',1,2565) @@ -412,9 +428,11 @@ LexToken(DOT,'.',1,2570) LexToken(VAR,'out2',1,2571) LexToken(ASSIGNMENT,'=',1,2575) LexToken(OPENSQBRACKET,'[',1,2576) -LexToken(NUMBER,'-2',1,2577) +LexToken(ADDITION,'-',1,2577) +LexToken(NUMBER,'2',1,2578) LexToken(SEMICOLON,';',1,2579) -LexToken(NUMBER,'-2',1,2580) +LexToken(ADDITION,'-',1,2580) +LexToken(NUMBER,'2',1,2581) LexToken(CLOSESQBRACKET,']',1,2582) LexToken(EOL,'\n',1,2583) LexToken(VAR,'model',1,2592) diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 5bd335a6..920f4f3f 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -303,24 +303,24 @@ LexToken(NUMBER,'0',1,2297) LexToken(SEMICOLON,';',1,2298) LexToken(NUMBER,'0',1,2299) LexToken(SEMICOLON,';',1,2300) -LexToken(OPERATOR,'-',1,2301) +LexToken(ADDITION,'-',1,2301) LexToken(OPENBRACKET,'(',1,2302) LexToken(NUMBER,'2',1,2303) -LexToken(OPERATOR,'^',1,2304) +LexToken(MULTIPLICATION,'^',1,2304) LexToken(NUMBER,'31',1,2305) LexToken(CLOSEBRACKET,')',1,2307) LexToken(SEMICOLON,';',1,2308) -LexToken(OPERATOR,'-',1,2309) +LexToken(ADDITION,'-',1,2309) LexToken(OPENBRACKET,'(',1,2310) LexToken(NUMBER,'2',1,2311) -LexToken(OPERATOR,'^',1,2312) +LexToken(MULTIPLICATION,'^',1,2312) LexToken(NUMBER,'15',1,2313) LexToken(CLOSEBRACKET,')',1,2315) LexToken(SEMICOLON,';',1,2316) -LexToken(OPERATOR,'-',1,2317) +LexToken(ADDITION,'-',1,2317) LexToken(OPENBRACKET,'(',1,2318) LexToken(NUMBER,'2',1,2319) -LexToken(OPERATOR,'^',1,2320) +LexToken(MULTIPLICATION,'^',1,2320) LexToken(NUMBER,'7',1,2321) LexToken(CLOSEBRACKET,')',1,2322) LexToken(SEMICOLON,';',1,2323) @@ -340,45 +340,51 @@ LexToken(NUMBER,'0',1,2353) LexToken(SEMICOLON,';',1,2354) LexToken(OPENBRACKET,'(',1,2355) LexToken(NUMBER,'2',1,2356) -LexToken(OPERATOR,'^',1,2357) +LexToken(MULTIPLICATION,'^',1,2357) LexToken(NUMBER,'31',1,2358) LexToken(CLOSEBRACKET,')',1,2360) -LexToken(NUMBER,'-1',1,2361) +LexToken(ADDITION,'-',1,2361) +LexToken(NUMBER,'1',1,2362) LexToken(SEMICOLON,';',1,2363) LexToken(OPENBRACKET,'(',1,2364) LexToken(NUMBER,'2',1,2365) -LexToken(OPERATOR,'^',1,2366) +LexToken(MULTIPLICATION,'^',1,2366) LexToken(NUMBER,'15',1,2367) LexToken(CLOSEBRACKET,')',1,2369) -LexToken(NUMBER,'-1',1,2370) +LexToken(ADDITION,'-',1,2370) +LexToken(NUMBER,'1',1,2371) LexToken(SEMICOLON,';',1,2372) LexToken(OPENBRACKET,'(',1,2373) LexToken(NUMBER,'2',1,2374) -LexToken(OPERATOR,'^',1,2375) +LexToken(MULTIPLICATION,'^',1,2375) LexToken(NUMBER,'7',1,2376) LexToken(CLOSEBRACKET,')',1,2377) -LexToken(NUMBER,'-1',1,2378) +LexToken(ADDITION,'-',1,2378) +LexToken(NUMBER,'1',1,2379) LexToken(SEMICOLON,';',1,2380) LexToken(OPENBRACKET,'(',1,2381) LexToken(NUMBER,'2',1,2382) -LexToken(OPERATOR,'^',1,2383) +LexToken(MULTIPLICATION,'^',1,2383) LexToken(NUMBER,'32',1,2384) LexToken(CLOSEBRACKET,')',1,2386) -LexToken(NUMBER,'-1',1,2387) +LexToken(ADDITION,'-',1,2387) +LexToken(NUMBER,'1',1,2388) LexToken(SEMICOLON,';',1,2389) LexToken(OPENBRACKET,'(',1,2390) LexToken(NUMBER,'2',1,2391) -LexToken(OPERATOR,'^',1,2392) +LexToken(MULTIPLICATION,'^',1,2392) LexToken(NUMBER,'16',1,2393) LexToken(CLOSEBRACKET,')',1,2395) -LexToken(NUMBER,'-1',1,2396) +LexToken(ADDITION,'-',1,2396) +LexToken(NUMBER,'1',1,2397) LexToken(SEMICOLON,';',1,2398) LexToken(OPENBRACKET,'(',1,2399) LexToken(NUMBER,'2',1,2400) -LexToken(OPERATOR,'^',1,2401) +LexToken(MULTIPLICATION,'^',1,2401) LexToken(NUMBER,'8',1,2402) LexToken(CLOSEBRACKET,')',1,2403) -LexToken(NUMBER,'-1',1,2404) +LexToken(ADDITION,'-',1,2404) +LexToken(NUMBER,'1',1,2405) LexToken(CLOSESQBRACKET,']',1,2406) LexToken(EOL,'\n',1,2407) LexToken(IF,'if',1,2420) @@ -884,7 +890,7 @@ LexToken(EOL,'\n',1,5218) LexToken(VAR,'it',1,5231) LexToken(ASSIGNMENT,'=',1,5233) LexToken(VAR,'dtype',1,5234) -LexToken(OPERATOR,'*',1,5239) +LexToken(MULTIPLICATION,'*',1,5239) LexToken(VAR,'ones',1,5240) LexToken(OPENBRACKET,'(',1,5244) LexToken(NUMBER,'1',1,5245) @@ -906,19 +912,25 @@ LexToken(EOL,'\n',1,5299) LexToken(VAR,'in',1,5316) LexToken(ASSIGNMENT,'=',1,5318) LexToken(OPENSQBRACKET,'[',1,5319) -LexToken(NUMBER,'-1',1,5320) -LexToken(NUMBER,'-2',1,5323) +LexToken(ADDITION,'-',1,5320) +LexToken(NUMBER,'1',1,5321) +LexToken(ADDITION,'-',1,5323) +LexToken(NUMBER,'2',1,5324) LexToken(SEMICOLON,';',1,5325) -LexToken(NUMBER,'-2',1,5326) -LexToken(NUMBER,'-3',1,5329) +LexToken(ADDITION,'-',1,5326) +LexToken(NUMBER,'2',1,5327) +LexToken(ADDITION,'-',1,5329) +LexToken(NUMBER,'3',1,5330) LexToken(CLOSESQBRACKET,']',1,5331) LexToken(SEMICOLON,';',1,5332) LexToken(EOL,'\n',1,5333) LexToken(VAR,'out',1,5350) LexToken(ASSIGNMENT,'=',1,5353) LexToken(OPENSQBRACKET,'[',1,5354) -LexToken(NUMBER,'-1',1,5355) -LexToken(NUMBER,'-3',1,5358) +LexToken(ADDITION,'-',1,5355) +LexToken(NUMBER,'1',1,5356) +LexToken(ADDITION,'-',1,5358) +LexToken(NUMBER,'3',1,5359) LexToken(CLOSESQBRACKET,']',1,5360) LexToken(SEMICOLON,';',1,5361) LexToken(EOL,'\n',1,5362) @@ -931,18 +943,24 @@ LexToken(EOL,'\n',1,5394) LexToken(VAR,'in',1,5411) LexToken(ASSIGNMENT,'=',1,5413) LexToken(OPENSQBRACKET,'[',1,5414) -LexToken(NUMBER,'-1',1,5415) -LexToken(NUMBER,'-2',1,5418) +LexToken(ADDITION,'-',1,5415) +LexToken(NUMBER,'1',1,5416) +LexToken(ADDITION,'-',1,5418) +LexToken(NUMBER,'2',1,5419) LexToken(SEMICOLON,';',1,5420) -LexToken(NUMBER,'-1',1,5421) -LexToken(NUMBER,'-2',1,5424) +LexToken(ADDITION,'-',1,5421) +LexToken(NUMBER,'1',1,5422) +LexToken(ADDITION,'-',1,5424) +LexToken(NUMBER,'2',1,5425) LexToken(CLOSESQBRACKET,']',1,5426) LexToken(EOL,'\n',1,5427) LexToken(VAR,'out',1,5444) LexToken(ASSIGNMENT,'=',1,5447) LexToken(OPENSQBRACKET,'[',1,5448) -LexToken(NUMBER,'-1',1,5449) -LexToken(NUMBER,'-2',1,5452) +LexToken(ADDITION,'-',1,5449) +LexToken(NUMBER,'1',1,5450) +LexToken(ADDITION,'-',1,5452) +LexToken(NUMBER,'2',1,5453) LexToken(CLOSESQBRACKET,']',1,5454) LexToken(EOL,'\n',1,5455) LexToken(ELSE,'else',1,5468) @@ -950,8 +968,10 @@ LexToken(EOL,'\n',1,5472) LexToken(VAR,'in',1,5489) LexToken(ASSIGNMENT,'=',1,5491) LexToken(OPENSQBRACKET,'[',1,5492) -LexToken(NUMBER,'-1',1,5493) -LexToken(NUMBER,'-2',1,5496) +LexToken(ADDITION,'-',1,5493) +LexToken(NUMBER,'1',1,5494) +LexToken(ADDITION,'-',1,5496) +LexToken(NUMBER,'2',1,5497) LexToken(SEMICOLON,';',1,5498) LexToken(NUMBER,'1',1,5499) LexToken(NUMBER,'1',1,5501) @@ -960,8 +980,10 @@ LexToken(EOL,'\n',1,5503) LexToken(VAR,'out',1,5520) LexToken(ASSIGNMENT,'=',1,5523) LexToken(OPENSQBRACKET,'[',1,5524) -LexToken(NUMBER,'-1',1,5525) -LexToken(NUMBER,'-2',1,5528) +LexToken(ADDITION,'-',1,5525) +LexToken(NUMBER,'1',1,5526) +LexToken(ADDITION,'-',1,5528) +LexToken(NUMBER,'2',1,5529) LexToken(CLOSESQBRACKET,']',1,5530) LexToken(EOL,'\n',1,5531) LexToken(END,'end',1,5544) @@ -1087,9 +1109,11 @@ LexToken(DOT,'.',1,6141) LexToken(VAR,'in',1,6142) LexToken(ASSIGNMENT,'=',1,6144) LexToken(OPENSQBRACKET,'[',1,6145) -LexToken(NUMBER,'-1',1,6146) +LexToken(ADDITION,'-',1,6146) +LexToken(NUMBER,'1',1,6147) LexToken(SEMICOLON,';',1,6148) -LexToken(NUMBER,'-2',1,6149) +LexToken(ADDITION,'-',1,6149) +LexToken(NUMBER,'2',1,6150) LexToken(CLOSESQBRACKET,']',1,6151) LexToken(EOL,'\n',1,6152) LexToken(VAR,'model',1,6161) @@ -1097,22 +1121,26 @@ LexToken(DOT,'.',1,6166) LexToken(VAR,'in2',1,6167) LexToken(ASSIGNMENT,'=',1,6170) LexToken(OPENSQBRACKET,'[',1,6171) -LexToken(NUMBER,'-2',1,6172) +LexToken(ADDITION,'-',1,6172) +LexToken(NUMBER,'2',1,6173) LexToken(SEMICOLON,';',1,6174) -LexToken(NUMBER,'-3',1,6175) +LexToken(ADDITION,'-',1,6175) +LexToken(NUMBER,'3',1,6176) LexToken(CLOSESQBRACKET,']',1,6177) LexToken(EOL,'\n',1,6178) LexToken(VAR,'model',1,6187) LexToken(DOT,'.',1,6192) LexToken(VAR,'out',1,6193) LexToken(ASSIGNMENT,'=',1,6196) -LexToken(NUMBER,'-1',1,6197) +LexToken(ADDITION,'-',1,6197) +LexToken(NUMBER,'1',1,6198) LexToken(EOL,'\n',1,6199) LexToken(VAR,'model',1,6208) LexToken(DOT,'.',1,6213) LexToken(VAR,'out2',1,6214) LexToken(ASSIGNMENT,'=',1,6218) -LexToken(NUMBER,'-3',1,6219) +LexToken(ADDITION,'-',1,6219) +LexToken(NUMBER,'3',1,6220) LexToken(EOL,'\n',1,6221) LexToken(VAR,'model',1,6230) LexToken(DOT,'.',1,6235) diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 879e6d00..04c21f0b 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -362,13 +362,15 @@ LexToken(VAR,'model',1,2343) LexToken(DOT,'.',1,2348) LexToken(VAR,'in',1,2349) LexToken(ASSIGNMENT,'=',1,2351) -LexToken(NUMBER,'-1',1,2352) +LexToken(ADDITION,'-',1,2352) +LexToken(NUMBER,'1',1,2353) LexToken(EOL,'\n',1,2354) LexToken(VAR,'model',1,2363) LexToken(DOT,'.',1,2368) LexToken(VAR,'in2',1,2369) LexToken(ASSIGNMENT,'=',1,2372) -LexToken(NUMBER,'-2',1,2373) +LexToken(ADDITION,'-',1,2373) +LexToken(NUMBER,'2',1,2374) LexToken(EOL,'\n',1,2375) LexToken(VAR,'model',1,2384) LexToken(DOT,'.',1,2389) @@ -380,13 +382,15 @@ LexToken(VAR,'model',1,2406) LexToken(DOT,'.',1,2411) LexToken(VAR,'out',1,2412) LexToken(ASSIGNMENT,'=',1,2415) -LexToken(NUMBER,'-2',1,2416) +LexToken(ADDITION,'-',1,2416) +LexToken(NUMBER,'2',1,2417) LexToken(EOL,'\n',1,2418) LexToken(VAR,'model',1,2427) LexToken(DOT,'.',1,2432) LexToken(VAR,'out2',1,2433) LexToken(ASSIGNMENT,'=',1,2437) -LexToken(NUMBER,'-1',1,2438) +LexToken(ADDITION,'-',1,2438) +LexToken(NUMBER,'1',1,2439) LexToken(EOL,'\n',1,2440) LexToken(VAR,'model',1,2449) LexToken(DOT,'.',1,2454) diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 8b3db4bd..a3859491 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -140,15 +140,18 @@ LexToken(VAR,'list',1,1382) LexToken(OPENBRACKET,'(',1,1386) LexToken(DQSTRING,'"vec"',1,1391) LexToken(COMMA,',',1,1392) -LexToken(NUMBER,'-1',1,1393) +LexToken(ADDITION,'-',1,1393) +LexToken(NUMBER,'1',1,1394) LexToken(COMMA,',',1,1395) LexToken(DQSTRING,'"vec"',1,1400) LexToken(COMMA,',',1,1401) -LexToken(NUMBER,'-1',1,1402) +LexToken(ADDITION,'-',1,1402) +LexToken(NUMBER,'1',1,1403) LexToken(COMMA,',',1,1404) LexToken(DQSTRING,'"vec"',1,1409) LexToken(COMMA,',',1,1410) -LexToken(NUMBER,'-1',1,1411) +LexToken(ADDITION,'-',1,1411) +LexToken(NUMBER,'1',1,1412) LexToken(CLOSEBRACKET,')',1,1413) LexToken(COMMA,',',1,1414) LexToken(VAR,'label',1,1415) @@ -233,7 +236,7 @@ LexToken(VAR,'l1',1,1853) LexToken(OPENBRACKET,'(',1,1855) LexToken(NUMBER,'1',1,1856) LexToken(CLOSEBRACKET,')',1,1857) -LexToken(OPERATOR,'*',1,1858) +LexToken(MULTIPLICATION,'*',1,1858) LexToken(VAR,'l1',1,1859) LexToken(OPENBRACKET,'(',1,1861) LexToken(NUMBER,'2',1,1862) @@ -269,7 +272,7 @@ LexToken(VAR,'l1',1,2026) LexToken(OPENBRACKET,'(',1,2028) LexToken(NUMBER,'1',1,2029) LexToken(CLOSEBRACKET,')',1,2030) -LexToken(OPERATOR,'*',1,2031) +LexToken(MULTIPLICATION,'*',1,2031) LexToken(VAR,'l1',1,2032) LexToken(OPENBRACKET,'(',1,2034) LexToken(NUMBER,'2',1,2035) @@ -300,7 +303,7 @@ LexToken(VAR,'out',1,2193) LexToken(OPENBRACKET,'(',1,2196) LexToken(NUMBER,'2',1,2197) LexToken(CLOSEBRACKET,')',1,2198) -LexToken(OPERATOR,'*',1,2199) +LexToken(MULTIPLICATION,'*',1,2199) LexToken(VAR,'out',1,2200) LexToken(OPENBRACKET,'(',1,2203) LexToken(NUMBER,'1',1,2204) @@ -312,7 +315,7 @@ LexToken(VAR,'l1',1,2209) LexToken(OPENBRACKET,'(',1,2211) LexToken(NUMBER,'1',1,2212) LexToken(CLOSEBRACKET,')',1,2213) -LexToken(OPERATOR,'*',1,2214) +LexToken(MULTIPLICATION,'*',1,2214) LexToken(VAR,'l1',1,2215) LexToken(OPENBRACKET,'(',1,2217) LexToken(NUMBER,'2',1,2218) @@ -533,13 +536,15 @@ LexToken(VAR,'model',1,3355) LexToken(DOT,'.',1,3360) LexToken(VAR,'in',1,3361) LexToken(ASSIGNMENT,'=',1,3363) -LexToken(NUMBER,'-1',1,3364) +LexToken(ADDITION,'-',1,3364) +LexToken(NUMBER,'1',1,3365) LexToken(EOL,'\n',1,3366) LexToken(VAR,'model',1,3375) LexToken(DOT,'.',1,3380) LexToken(VAR,'in2',1,3381) LexToken(ASSIGNMENT,'=',1,3384) -LexToken(NUMBER,'-2',1,3385) +LexToken(ADDITION,'-',1,3385) +LexToken(NUMBER,'2',1,3386) LexToken(EOL,'\n',1,3387) LexToken(VAR,'model',1,3396) LexToken(DOT,'.',1,3401) @@ -551,13 +556,15 @@ LexToken(VAR,'model',1,3418) LexToken(DOT,'.',1,3423) LexToken(VAR,'out',1,3424) LexToken(ASSIGNMENT,'=',1,3427) -LexToken(NUMBER,'-1',1,3428) +LexToken(ADDITION,'-',1,3428) +LexToken(NUMBER,'1',1,3429) LexToken(EOL,'\n',1,3430) LexToken(VAR,'model',1,3439) LexToken(DOT,'.',1,3444) LexToken(VAR,'out2',1,3445) LexToken(ASSIGNMENT,'=',1,3449) -LexToken(NUMBER,'-2',1,3450) +LexToken(ADDITION,'-',1,3450) +LexToken(NUMBER,'2',1,3451) LexToken(EOL,'\n',1,3452) LexToken(VAR,'model',1,3461) LexToken(DOT,'.',1,3466) diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 3baa94d0..332ff1d4 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -185,15 +185,18 @@ LexToken(EOL,'\n',1,1575) LexToken(VAR,'in',1,1596) LexToken(ASSIGNMENT,'=',1,1598) LexToken(OPENSQBRACKET,'[',1,1599) -LexToken(NUMBER,'-1',1,1600) -LexToken(NUMBER,'-2',1,1603) +LexToken(ADDITION,'-',1,1600) +LexToken(NUMBER,'1',1,1601) +LexToken(ADDITION,'-',1,1603) +LexToken(NUMBER,'2',1,1604) LexToken(CLOSESQBRACKET,']',1,1605) LexToken(SEMICOLON,';',1,1606) LexToken(EOL,'\n',1,1607) LexToken(VAR,'out',1,1628) LexToken(ASSIGNMENT,'=',1,1631) LexToken(OPENSQBRACKET,'[',1,1632) -LexToken(NUMBER,'-1',1,1633) +LexToken(ADDITION,'-',1,1633) +LexToken(NUMBER,'1',1,1634) LexToken(NUMBER,'1',1,1636) LexToken(CLOSESQBRACKET,']',1,1637) LexToken(SEMICOLON,';',1,1638) @@ -219,22 +222,30 @@ LexToken(EOL,'\n',1,1753) LexToken(VAR,'in',1,1774) LexToken(ASSIGNMENT,'=',1,1776) LexToken(OPENSQBRACKET,'[',1,1777) -LexToken(NUMBER,'-1',1,1778) -LexToken(NUMBER,'-2',1,1781) +LexToken(ADDITION,'-',1,1778) +LexToken(NUMBER,'1',1,1779) +LexToken(ADDITION,'-',1,1781) +LexToken(NUMBER,'2',1,1782) LexToken(CLOSESQBRACKET,']',1,1783) LexToken(SEMICOLON,';',1,1784) LexToken(EOL,'\n',1,1785) LexToken(VAR,'out',1,1806) LexToken(ASSIGNMENT,'=',1,1809) LexToken(OPENSQBRACKET,'[',1,1810) -LexToken(NUMBER,'-1',1,1811) -LexToken(NUMBER,'-1',1,1814) +LexToken(ADDITION,'-',1,1811) +LexToken(NUMBER,'1',1,1812) +LexToken(ADDITION,'-',1,1814) +LexToken(NUMBER,'1',1,1815) LexToken(SEMICOLON,';',1,1816) -LexToken(NUMBER,'-1',1,1817) -LexToken(NUMBER,'-2',1,1820) +LexToken(ADDITION,'-',1,1817) +LexToken(NUMBER,'1',1,1818) +LexToken(ADDITION,'-',1,1820) +LexToken(NUMBER,'2',1,1821) LexToken(SEMICOLON,';',1,1822) -LexToken(NUMBER,'-2',1,1823) -LexToken(NUMBER,'-2',1,1826) +LexToken(ADDITION,'-',1,1823) +LexToken(NUMBER,'2',1,1824) +LexToken(ADDITION,'-',1,1826) +LexToken(NUMBER,'2',1,1827) LexToken(CLOSESQBRACKET,']',1,1828) LexToken(SEMICOLON,';',1,1829) LexToken(EOL,'\n',1,1830) @@ -291,15 +302,18 @@ LexToken(EOL,'\n',1,2139) LexToken(VAR,'in',1,2160) LexToken(ASSIGNMENT,'=',1,2162) LexToken(OPENSQBRACKET,'[',1,2163) -LexToken(NUMBER,'-1',1,2164) -LexToken(NUMBER,'-2',1,2167) +LexToken(ADDITION,'-',1,2164) +LexToken(NUMBER,'1',1,2165) +LexToken(ADDITION,'-',1,2167) +LexToken(NUMBER,'2',1,2168) LexToken(CLOSESQBRACKET,']',1,2169) LexToken(SEMICOLON,';',1,2170) LexToken(EOL,'\n',1,2171) LexToken(VAR,'out',1,2192) LexToken(ASSIGNMENT,'=',1,2195) LexToken(OPENSQBRACKET,'[',1,2196) -LexToken(NUMBER,'-1',1,2197) +LexToken(ADDITION,'-',1,2197) +LexToken(NUMBER,'1',1,2198) LexToken(NUMBER,'1',1,2200) LexToken(CLOSESQBRACKET,']',1,2201) LexToken(SEMICOLON,';',1,2202) @@ -325,22 +339,30 @@ LexToken(EOL,'\n',1,2318) LexToken(VAR,'in',1,2339) LexToken(ASSIGNMENT,'=',1,2341) LexToken(OPENSQBRACKET,'[',1,2342) -LexToken(NUMBER,'-1',1,2343) -LexToken(NUMBER,'-2',1,2346) +LexToken(ADDITION,'-',1,2343) +LexToken(NUMBER,'1',1,2344) +LexToken(ADDITION,'-',1,2346) +LexToken(NUMBER,'2',1,2347) LexToken(CLOSESQBRACKET,']',1,2348) LexToken(SEMICOLON,';',1,2349) LexToken(EOL,'\n',1,2350) LexToken(VAR,'out',1,2371) LexToken(ASSIGNMENT,'=',1,2374) LexToken(OPENSQBRACKET,'[',1,2375) -LexToken(NUMBER,'-1',1,2376) -LexToken(NUMBER,'-1',1,2379) +LexToken(ADDITION,'-',1,2376) +LexToken(NUMBER,'1',1,2377) +LexToken(ADDITION,'-',1,2379) +LexToken(NUMBER,'1',1,2380) LexToken(SEMICOLON,';',1,2381) -LexToken(NUMBER,'-1',1,2382) -LexToken(NUMBER,'-2',1,2385) +LexToken(ADDITION,'-',1,2382) +LexToken(NUMBER,'1',1,2383) +LexToken(ADDITION,'-',1,2385) +LexToken(NUMBER,'2',1,2386) LexToken(SEMICOLON,';',1,2387) -LexToken(NUMBER,'-2',1,2388) -LexToken(NUMBER,'-2',1,2391) +LexToken(ADDITION,'-',1,2388) +LexToken(NUMBER,'2',1,2389) +LexToken(ADDITION,'-',1,2391) +LexToken(NUMBER,'2',1,2392) LexToken(CLOSESQBRACKET,']',1,2393) LexToken(SEMICOLON,';',1,2394) LexToken(EOL,'\n',1,2395) @@ -514,13 +536,15 @@ LexToken(VAR,'model',1,3264) LexToken(DOT,'.',1,3269) LexToken(VAR,'in',1,3270) LexToken(ASSIGNMENT,'=',1,3272) -LexToken(NUMBER,'-1',1,3273) +LexToken(ADDITION,'-',1,3273) +LexToken(NUMBER,'1',1,3274) LexToken(EOL,'\n',1,3275) LexToken(VAR,'model',1,3284) LexToken(DOT,'.',1,3289) LexToken(VAR,'in2',1,3290) LexToken(ASSIGNMENT,'=',1,3293) -LexToken(NUMBER,'-2',1,3294) +LexToken(ADDITION,'-',1,3294) +LexToken(NUMBER,'2',1,3295) LexToken(EOL,'\n',1,3296) LexToken(VAR,'model',1,3305) LexToken(DOT,'.',1,3310) @@ -532,7 +556,8 @@ LexToken(VAR,'model',1,3327) LexToken(DOT,'.',1,3332) LexToken(VAR,'out',1,3333) LexToken(ASSIGNMENT,'=',1,3336) -LexToken(NUMBER,'-1',1,3337) +LexToken(ADDITION,'-',1,3337) +LexToken(NUMBER,'1',1,3338) LexToken(EOL,'\n',1,3339) LexToken(VAR,'model',1,3348) LexToken(DOT,'.',1,3353) diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index d6068aba..08649d4f 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -206,7 +206,8 @@ LexToken(EOL,'\n',1,1663) LexToken(VAR,'out',1,1684) LexToken(ASSIGNMENT,'=',1,1687) LexToken(OPENSQBRACKET,'[',1,1688) -LexToken(NUMBER,'-1',1,1689) +LexToken(ADDITION,'-',1,1689) +LexToken(NUMBER,'1',1,1690) LexToken(NUMBER,'1',1,1692) LexToken(CLOSESQBRACKET,']',1,1693) LexToken(SEMICOLON,';',1,1694) @@ -228,7 +229,8 @@ LexToken(VAR,'out',1,1805) LexToken(ASSIGNMENT,'=',1,1808) LexToken(OPENSQBRACKET,'[',1,1809) LexToken(NUMBER,'1',1,1810) -LexToken(NUMBER,'-2',1,1812) +LexToken(ADDITION,'-',1,1812) +LexToken(NUMBER,'2',1,1813) LexToken(CLOSESQBRACKET,']',1,1814) LexToken(SEMICOLON,';',1,1815) LexToken(EOL,'\n',1,1816) @@ -302,7 +304,8 @@ LexToken(EOL,'\n',1,2235) LexToken(VAR,'out',1,2256) LexToken(ASSIGNMENT,'=',1,2259) LexToken(OPENSQBRACKET,'[',1,2260) -LexToken(NUMBER,'-1',1,2261) +LexToken(ADDITION,'-',1,2261) +LexToken(NUMBER,'1',1,2262) LexToken(NUMBER,'1',1,2264) LexToken(CLOSESQBRACKET,']',1,2265) LexToken(SEMICOLON,';',1,2266) @@ -324,7 +327,8 @@ LexToken(VAR,'out',1,2378) LexToken(ASSIGNMENT,'=',1,2381) LexToken(OPENSQBRACKET,'[',1,2382) LexToken(NUMBER,'1',1,2383) -LexToken(NUMBER,'-2',1,2385) +LexToken(ADDITION,'-',1,2385) +LexToken(NUMBER,'2',1,2386) LexToken(CLOSESQBRACKET,']',1,2387) LexToken(SEMICOLON,';',1,2388) LexToken(EOL,'\n',1,2389) @@ -505,13 +509,15 @@ LexToken(VAR,'model',1,3283) LexToken(DOT,'.',1,3288) LexToken(VAR,'in',1,3289) LexToken(ASSIGNMENT,'=',1,3291) -LexToken(NUMBER,'-1',1,3292) +LexToken(ADDITION,'-',1,3292) +LexToken(NUMBER,'1',1,3293) LexToken(EOL,'\n',1,3294) LexToken(VAR,'model',1,3303) LexToken(DOT,'.',1,3308) LexToken(VAR,'in2',1,3309) LexToken(ASSIGNMENT,'=',1,3312) -LexToken(NUMBER,'-2',1,3313) +LexToken(ADDITION,'-',1,3313) +LexToken(NUMBER,'2',1,3314) LexToken(EOL,'\n',1,3315) LexToken(VAR,'model',1,3324) LexToken(DOT,'.',1,3329) diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 973c70ff..1ef8be22 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -378,25 +378,29 @@ LexToken(VAR,'model',1,2506) LexToken(DOT,'.',1,2511) LexToken(VAR,'in',1,2512) LexToken(ASSIGNMENT,'=',1,2514) -LexToken(NUMBER,'-1',1,2515) +LexToken(ADDITION,'-',1,2515) +LexToken(NUMBER,'1',1,2516) LexToken(EOL,'\n',1,2517) LexToken(VAR,'model',1,2526) LexToken(DOT,'.',1,2531) LexToken(VAR,'in2',1,2532) LexToken(ASSIGNMENT,'=',1,2535) -LexToken(NUMBER,'-2',1,2536) +LexToken(ADDITION,'-',1,2536) +LexToken(NUMBER,'2',1,2537) LexToken(EOL,'\n',1,2538) LexToken(VAR,'model',1,2547) LexToken(DOT,'.',1,2552) LexToken(VAR,'out',1,2553) LexToken(ASSIGNMENT,'=',1,2556) -LexToken(NUMBER,'-2',1,2557) +LexToken(ADDITION,'-',1,2557) +LexToken(NUMBER,'2',1,2558) LexToken(EOL,'\n',1,2559) LexToken(VAR,'model',1,2568) LexToken(DOT,'.',1,2573) LexToken(VAR,'out2',1,2574) LexToken(ASSIGNMENT,'=',1,2578) -LexToken(NUMBER,'-1',1,2579) +LexToken(ADDITION,'-',1,2579) +LexToken(NUMBER,'1',1,2580) LexToken(EOL,'\n',1,2581) LexToken(VAR,'model',1,2590) LexToken(DOT,'.',1,2595) diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 52fd879a..51c8a4ab 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -102,13 +102,15 @@ LexToken(VAR,'model',1,1123) LexToken(DOT,'.',1,1128) LexToken(VAR,'in',1,1129) LexToken(ASSIGNMENT,'=',1,1131) -LexToken(NUMBER,'-1',1,1132) +LexToken(ADDITION,'-',1,1132) +LexToken(NUMBER,'1',1,1133) LexToken(EOL,'\n',1,1134) LexToken(VAR,'model',1,1143) LexToken(DOT,'.',1,1148) LexToken(VAR,'in2',1,1149) LexToken(ASSIGNMENT,'=',1,1152) -LexToken(NUMBER,'-2',1,1153) +LexToken(ADDITION,'-',1,1153) +LexToken(NUMBER,'2',1,1154) LexToken(EOL,'\n',1,1155) LexToken(VAR,'model',1,1164) LexToken(DOT,'.',1,1169) @@ -120,13 +122,15 @@ LexToken(VAR,'model',1,1186) LexToken(DOT,'.',1,1191) LexToken(VAR,'out',1,1192) LexToken(ASSIGNMENT,'=',1,1195) -LexToken(NUMBER,'-1',1,1196) +LexToken(ADDITION,'-',1,1196) +LexToken(NUMBER,'1',1,1197) LexToken(EOL,'\n',1,1198) LexToken(VAR,'model',1,1207) LexToken(DOT,'.',1,1212) LexToken(VAR,'out2',1,1213) LexToken(ASSIGNMENT,'=',1,1217) -LexToken(NUMBER,'-2',1,1218) +LexToken(ADDITION,'-',1,1218) +LexToken(NUMBER,'2',1,1219) LexToken(EOL,'\n',1,1220) LexToken(VAR,'model',1,1229) LexToken(DOT,'.',1,1234) diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index afa23d0e..11c7b8ac 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -169,8 +169,10 @@ LexToken(EOL,'\n',1,1487) LexToken(VAR,'in',1,1504) LexToken(ASSIGNMENT,'=',1,1506) LexToken(OPENSQBRACKET,'[',1,1507) -LexToken(NUMBER,'-1',1,1508) -LexToken(NUMBER,'-2',1,1511) +LexToken(ADDITION,'-',1,1508) +LexToken(NUMBER,'1',1,1509) +LexToken(ADDITION,'-',1,1511) +LexToken(NUMBER,'2',1,1512) LexToken(CLOSESQBRACKET,']',1,1513) LexToken(SEMICOLON,';',1,1514) LexToken(EOL,'\n',1,1515) @@ -182,11 +184,15 @@ LexToken(EOL,'\n',1,1537) LexToken(VAR,'out',1,1554) LexToken(ASSIGNMENT,'=',1,1557) LexToken(OPENSQBRACKET,'[',1,1558) -LexToken(NUMBER,'-1',1,1559) -LexToken(NUMBER,'-2',1,1562) +LexToken(ADDITION,'-',1,1559) +LexToken(NUMBER,'1',1,1560) +LexToken(ADDITION,'-',1,1562) +LexToken(NUMBER,'2',1,1563) LexToken(SEMICOLON,';',1,1564) -LexToken(NUMBER,'-1',1,1565) -LexToken(NUMBER,'-2',1,1568) +LexToken(ADDITION,'-',1,1565) +LexToken(NUMBER,'1',1,1566) +LexToken(ADDITION,'-',1,1568) +LexToken(NUMBER,'2',1,1569) LexToken(CLOSESQBRACKET,']',1,1570) LexToken(SEMICOLON,';',1,1571) LexToken(EOL,'\n',1,1572) @@ -214,11 +220,15 @@ LexToken(EOL,'\n',1,1681) LexToken(VAR,'in',1,1698) LexToken(ASSIGNMENT,'=',1,1700) LexToken(OPENSQBRACKET,'[',1,1701) -LexToken(NUMBER,'-1',1,1702) -LexToken(NUMBER,'-2',1,1705) +LexToken(ADDITION,'-',1,1702) +LexToken(NUMBER,'1',1,1703) +LexToken(ADDITION,'-',1,1705) +LexToken(NUMBER,'2',1,1706) LexToken(SEMICOLON,';',1,1707) -LexToken(NUMBER,'-1',1,1708) -LexToken(NUMBER,'-2',1,1711) +LexToken(ADDITION,'-',1,1708) +LexToken(NUMBER,'1',1,1709) +LexToken(ADDITION,'-',1,1711) +LexToken(NUMBER,'2',1,1712) LexToken(CLOSESQBRACKET,']',1,1713) LexToken(SEMICOLON,';',1,1714) LexToken(EOL,'\n',1,1715) @@ -233,8 +243,10 @@ LexToken(EOL,'\n',1,1741) LexToken(VAR,'out',1,1758) LexToken(ASSIGNMENT,'=',1,1761) LexToken(OPENSQBRACKET,'[',1,1762) -LexToken(NUMBER,'-1',1,1763) -LexToken(NUMBER,'-2',1,1766) +LexToken(ADDITION,'-',1,1763) +LexToken(NUMBER,'1',1,1764) +LexToken(ADDITION,'-',1,1766) +LexToken(NUMBER,'2',1,1767) LexToken(CLOSESQBRACKET,']',1,1768) LexToken(SEMICOLON,';',1,1769) LexToken(EOL,'\n',1,1770) @@ -383,13 +395,15 @@ LexToken(VAR,'model',1,2481) LexToken(DOT,'.',1,2486) LexToken(VAR,'in',1,2487) LexToken(ASSIGNMENT,'=',1,2489) -LexToken(NUMBER,'-1',1,2490) +LexToken(ADDITION,'-',1,2490) +LexToken(NUMBER,'1',1,2491) LexToken(EOL,'\n',1,2492) LexToken(VAR,'model',1,2501) LexToken(DOT,'.',1,2506) LexToken(VAR,'in2',1,2507) LexToken(ASSIGNMENT,'=',1,2510) -LexToken(NUMBER,'-2',1,2511) +LexToken(ADDITION,'-',1,2511) +LexToken(NUMBER,'2',1,2512) LexToken(EOL,'\n',1,2513) LexToken(VAR,'model',1,2522) LexToken(DOT,'.',1,2527) @@ -402,9 +416,11 @@ LexToken(DOT,'.',1,2549) LexToken(VAR,'out',1,2550) LexToken(ASSIGNMENT,'=',1,2553) LexToken(OPENSQBRACKET,'[',1,2554) -LexToken(NUMBER,'-1',1,2555) +LexToken(ADDITION,'-',1,2555) +LexToken(NUMBER,'1',1,2556) LexToken(SEMICOLON,';',1,2557) -LexToken(NUMBER,'-1',1,2558) +LexToken(ADDITION,'-',1,2558) +LexToken(NUMBER,'1',1,2559) LexToken(CLOSESQBRACKET,']',1,2560) LexToken(EOL,'\n',1,2561) LexToken(VAR,'model',1,2570) @@ -412,9 +428,11 @@ LexToken(DOT,'.',1,2575) LexToken(VAR,'out2',1,2576) LexToken(ASSIGNMENT,'=',1,2580) LexToken(OPENSQBRACKET,'[',1,2581) -LexToken(NUMBER,'-2',1,2582) +LexToken(ADDITION,'-',1,2582) +LexToken(NUMBER,'2',1,2583) LexToken(SEMICOLON,';',1,2584) -LexToken(NUMBER,'-2',1,2585) +LexToken(ADDITION,'-',1,2585) +LexToken(NUMBER,'2',1,2586) LexToken(CLOSESQBRACKET,']',1,2587) LexToken(EOL,'\n',1,2588) LexToken(VAR,'model',1,2597) diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 0c9fe618..d694d024 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -314,11 +314,14 @@ LexToken(DOT,'.',1,2011) LexToken(VAR,'in',1,2012) LexToken(ASSIGNMENT,'=',1,2014) LexToken(OPENSQBRACKET,'[',1,2015) -LexToken(NUMBER,'-1',1,2016) +LexToken(ADDITION,'-',1,2016) +LexToken(NUMBER,'1',1,2017) LexToken(SEMICOLON,';',1,2018) -LexToken(NUMBER,'-1',1,2019) +LexToken(ADDITION,'-',1,2019) +LexToken(NUMBER,'1',1,2020) LexToken(SEMICOLON,';',1,2021) -LexToken(NUMBER,'-1',1,2022) +LexToken(ADDITION,'-',1,2022) +LexToken(NUMBER,'1',1,2023) LexToken(CLOSESQBRACKET,']',1,2024) LexToken(EOL,'\n',1,2025) LexToken(VAR,'model',1,2034) @@ -326,11 +329,14 @@ LexToken(DOT,'.',1,2039) LexToken(VAR,'in2',1,2040) LexToken(ASSIGNMENT,'=',1,2043) LexToken(OPENSQBRACKET,'[',1,2044) -LexToken(NUMBER,'-1',1,2045) +LexToken(ADDITION,'-',1,2045) +LexToken(NUMBER,'1',1,2046) LexToken(SEMICOLON,';',1,2047) -LexToken(NUMBER,'-1',1,2048) +LexToken(ADDITION,'-',1,2048) +LexToken(NUMBER,'1',1,2049) LexToken(SEMICOLON,';',1,2050) -LexToken(NUMBER,'-1',1,2051) +LexToken(ADDITION,'-',1,2051) +LexToken(NUMBER,'1',1,2052) LexToken(CLOSESQBRACKET,']',1,2053) LexToken(EOL,'\n',1,2054) LexToken(VAR,'model',1,2063) @@ -347,13 +353,15 @@ LexToken(VAR,'model',1,2091) LexToken(DOT,'.',1,2096) LexToken(VAR,'out',1,2097) LexToken(ASSIGNMENT,'=',1,2100) -LexToken(NUMBER,'-1',1,2101) +LexToken(ADDITION,'-',1,2101) +LexToken(NUMBER,'1',1,2102) LexToken(EOL,'\n',1,2103) LexToken(VAR,'model',1,2112) LexToken(DOT,'.',1,2117) LexToken(VAR,'out2',1,2118) LexToken(ASSIGNMENT,'=',1,2122) -LexToken(NUMBER,'-1',1,2123) +LexToken(ADDITION,'-',1,2123) +LexToken(NUMBER,'1',1,2124) LexToken(EOL,'\n',1,2125) LexToken(VAR,'model',1,2134) LexToken(DOT,'.',1,2139) diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index ea37d43f..82ffd4cf 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -233,7 +233,7 @@ LexToken(VAR,'out',1,1783) LexToken(ASSIGNMENT,'=',1,1786) LexToken(OPENSQBRACKET,'[',1,1787) LexToken(VAR,'inp',1,1788) -LexToken(OPERATOR,'+',1,1791) +LexToken(ADDITION,'+',1,1791) LexToken(NUMBER,'1',1,1792) LexToken(VAR,'model',1,1794) LexToken(DOT,'.',1,1799) @@ -369,7 +369,8 @@ LexToken(VAR,'model',1,2369) LexToken(DOT,'.',1,2374) LexToken(VAR,'in',1,2375) LexToken(ASSIGNMENT,'=',1,2377) -LexToken(NUMBER,'-1',1,2378) +LexToken(ADDITION,'-',1,2378) +LexToken(NUMBER,'1',1,2379) LexToken(EOL,'\n',1,2380) LexToken(VAR,'model',1,2389) LexToken(DOT,'.',1,2394) @@ -387,7 +388,8 @@ LexToken(VAR,'model',1,2431) LexToken(DOT,'.',1,2436) LexToken(VAR,'out',1,2437) LexToken(ASSIGNMENT,'=',1,2440) -LexToken(NUMBER,'-2',1,2441) +LexToken(ADDITION,'-',1,2441) +LexToken(NUMBER,'2',1,2442) LexToken(EOL,'\n',1,2443) LexToken(VAR,'model',1,2452) LexToken(DOT,'.',1,2457) diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 6c60d5a6..194b44ba 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -318,13 +318,15 @@ LexToken(VAR,'model',1,2135) LexToken(DOT,'.',1,2140) LexToken(VAR,'in',1,2141) LexToken(ASSIGNMENT,'=',1,2143) -LexToken(NUMBER,'-1',1,2144) +LexToken(ADDITION,'-',1,2144) +LexToken(NUMBER,'1',1,2145) LexToken(EOL,'\n',1,2146) LexToken(VAR,'model',1,2155) LexToken(DOT,'.',1,2160) LexToken(VAR,'in2',1,2161) LexToken(ASSIGNMENT,'=',1,2164) -LexToken(NUMBER,'-2',1,2165) +LexToken(ADDITION,'-',1,2165) +LexToken(NUMBER,'2',1,2166) LexToken(EOL,'\n',1,2167) LexToken(VAR,'model',1,2176) LexToken(DOT,'.',1,2181) @@ -342,13 +344,15 @@ LexToken(VAR,'model',1,2221) LexToken(DOT,'.',1,2226) LexToken(VAR,'out',1,2227) LexToken(ASSIGNMENT,'=',1,2230) -LexToken(NUMBER,'-1',1,2231) +LexToken(ADDITION,'-',1,2231) +LexToken(NUMBER,'1',1,2232) LexToken(EOL,'\n',1,2233) LexToken(VAR,'model',1,2242) LexToken(DOT,'.',1,2247) LexToken(VAR,'out2',1,2248) LexToken(ASSIGNMENT,'=',1,2252) -LexToken(NUMBER,'-2',1,2253) +LexToken(ADDITION,'-',1,2253) +LexToken(NUMBER,'2',1,2254) LexToken(EOL,'\n',1,2255) LexToken(VAR,'model',1,2264) LexToken(DOT,'.',1,2269) diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 8f84642f..e7ed232c 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -411,17 +411,17 @@ LexToken(ASSIGNMENT,'=',1,2687) LexToken(OPENSQBRACKET,'[',1,2688) LexToken(OPENBRACKET,'(',1,2689) LexToken(VAR,'b',1,2690) -LexToken(OPERATOR,'-',1,2691) +LexToken(ADDITION,'-',1,2691) LexToken(VAR,'a',1,2692) LexToken(CLOSEBRACKET,')',1,2693) -LexToken(OPERATOR,'+',1,2694) +LexToken(ADDITION,'+',1,2694) LexToken(NUMBER,'1',1,2695) LexToken(OPENBRACKET,'(',1,2697) LexToken(VAR,'d',1,2698) -LexToken(OPERATOR,'-',1,2699) +LexToken(ADDITION,'-',1,2699) LexToken(VAR,'c',1,2700) LexToken(CLOSEBRACKET,')',1,2701) -LexToken(OPERATOR,'+',1,2702) +LexToken(ADDITION,'+',1,2702) LexToken(NUMBER,'1',1,2703) LexToken(CLOSESQBRACKET,']',1,2704) LexToken(SEMICOLON,';',1,2705) @@ -555,13 +555,15 @@ LexToken(VAR,'model',1,3263) LexToken(DOT,'.',1,3268) LexToken(VAR,'in',1,3269) LexToken(ASSIGNMENT,'=',1,3271) -LexToken(NUMBER,'-1',1,3272) +LexToken(ADDITION,'-',1,3272) +LexToken(NUMBER,'1',1,3273) LexToken(EOL,'\n',1,3274) LexToken(VAR,'model',1,3283) LexToken(DOT,'.',1,3288) LexToken(VAR,'in2',1,3289) LexToken(ASSIGNMENT,'=',1,3292) -LexToken(NUMBER,'-2',1,3293) +LexToken(ADDITION,'-',1,3293) +LexToken(NUMBER,'2',1,3294) LexToken(EOL,'\n',1,3295) LexToken(VAR,'model',1,3304) LexToken(DOT,'.',1,3309) @@ -573,13 +575,15 @@ LexToken(VAR,'model',1,3326) LexToken(DOT,'.',1,3331) LexToken(VAR,'out',1,3332) LexToken(ASSIGNMENT,'=',1,3335) -LexToken(NUMBER,'-1',1,3336) +LexToken(ADDITION,'-',1,3336) +LexToken(NUMBER,'1',1,3337) LexToken(EOL,'\n',1,3338) LexToken(VAR,'model',1,3347) LexToken(DOT,'.',1,3352) LexToken(VAR,'out2',1,3353) LexToken(ASSIGNMENT,'=',1,3357) -LexToken(NUMBER,'-2',1,3358) +LexToken(ADDITION,'-',1,3358) +LexToken(NUMBER,'2',1,3359) LexToken(EOL,'\n',1,3360) LexToken(VAR,'model',1,3369) LexToken(DOT,'.',1,3374) 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) diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index f8318a51..41877cae 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -93,13 +93,15 @@ LexToken(VAR,'model',1,1086) LexToken(DOT,'.',1,1091) LexToken(VAR,'in',1,1092) LexToken(ASSIGNMENT,'=',1,1094) -LexToken(NUMBER,'-1',1,1095) +LexToken(ADDITION,'-',1,1095) +LexToken(NUMBER,'1',1,1096) LexToken(EOL,'\n',1,1097) LexToken(VAR,'model',1,1106) LexToken(DOT,'.',1,1111) LexToken(VAR,'out',1,1112) LexToken(ASSIGNMENT,'=',1,1115) -LexToken(NUMBER,'-1',1,1116) +LexToken(ADDITION,'-',1,1116) +LexToken(NUMBER,'1',1,1117) LexToken(EOL,'\n',1,1118) LexToken(VAR,'model',1,1127) LexToken(DOT,'.',1,1132) diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 3493b2de..c4ca0723 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -147,14 +147,16 @@ LexToken(VAR,'model',1,1407) LexToken(DOT,'.',1,1412) LexToken(VAR,'nmode',1,1413) LexToken(ASSIGNMENT,'=',1,1418) -LexToken(NUMBER,'-1',1,1419) +LexToken(ADDITION,'-',1,1419) +LexToken(NUMBER,'1',1,1420) LexToken(SEMICOLON,';',1,1421) LexToken(EOL,'\n',1,1422) LexToken(VAR,'model',1,1443) LexToken(DOT,'.',1,1448) LexToken(VAR,'nzcross',1,1449) LexToken(ASSIGNMENT,'=',1,1456) -LexToken(NUMBER,'-1',1,1457) +LexToken(ADDITION,'-',1,1457) +LexToken(NUMBER,'1',1,1458) LexToken(SEMICOLON,';',1,1459) LexToken(EOL,'\n',1,1460) LexToken(ELSE,'else',1,1477) @@ -200,7 +202,8 @@ LexToken(THEN,'then',1,1709) LexToken(EOL,'\n',1,1713) LexToken(VAR,'nu',1,1722) LexToken(ASSIGNMENT,'=',1,1724) -LexToken(NUMBER,'-1',1,1725) +LexToken(ADDITION,'-',1,1725) +LexToken(NUMBER,'1',1,1726) LexToken(EOL,'\n',1,1727) LexToken(VAR,'model',1,1736) LexToken(ASSIGNMENT,'=',1,1741) diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index b52b8958..58e6c4f3 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -91,13 +91,15 @@ LexToken(VAR,'model',1,1059) LexToken(DOT,'.',1,1064) LexToken(VAR,'in',1,1065) LexToken(ASSIGNMENT,'=',1,1067) -LexToken(NUMBER,'-1',1,1068) +LexToken(ADDITION,'-',1,1068) +LexToken(NUMBER,'1',1,1069) LexToken(EOL,'\n',1,1070) LexToken(VAR,'model',1,1079) LexToken(DOT,'.',1,1084) LexToken(VAR,'out',1,1085) LexToken(ASSIGNMENT,'=',1,1088) -LexToken(NUMBER,'-1',1,1089) +LexToken(ADDITION,'-',1,1089) +LexToken(NUMBER,'1',1,1090) LexToken(EOL,'\n',1,1091) LexToken(VAR,'model',1,1100) LexToken(DOT,'.',1,1105) diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index c189e7bf..291cb9d1 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -131,14 +131,17 @@ LexToken(VAR,'list',1,1467) LexToken(OPENBRACKET,'(',1,1471) LexToken(DQSTRING,'"vec"',1,1476) LexToken(COMMA,',',1,1477) -LexToken(NUMBER,'-1',1,1478) +LexToken(ADDITION,'-',1,1478) +LexToken(NUMBER,'1',1,1479) LexToken(COMMA,',',1,1480) LexToken(DQSTRING,'"mat"',1,1485) LexToken(COMMA,',',1,1486) LexToken(OPENSQBRACKET,'[',1,1487) -LexToken(NUMBER,'-1',1,1488) +LexToken(ADDITION,'-',1,1488) +LexToken(NUMBER,'1',1,1489) LexToken(COMMA,',',1,1490) -LexToken(NUMBER,'-1',1,1491) +LexToken(ADDITION,'-',1,1491) +LexToken(NUMBER,'1',1,1492) LexToken(CLOSESQBRACKET,']',1,1493) LexToken(COMMA,',',1,1494) LexToken(DQSTRING,'"mat"',1,1499) @@ -372,25 +375,27 @@ LexToken(VAR,'rd',1,2426) LexToken(ASSIGNMENT,'=',1,2428) LexToken(OPENSQBRACKET,'[',1,2429) LexToken(NUMBER,'0.2',1,2430) -LexToken(OPERATOR,'+',1,2433) +LexToken(ADDITION,'+',1,2433) LexToken(NUMBER,'0.8',1,2434) -LexToken(OPERATOR,'*',1,2437) +LexToken(MULTIPLICATION,'*',1,2437) LexToken(PREVAR_COMPLEX,'%i',1,2438) LexToken(COMMA,',',1,2440) LexToken(NUMBER,'0.2',1,2441) -LexToken(NUMBER,'-0.8',1,2444) -LexToken(OPERATOR,'*',1,2448) +LexToken(ADDITION,'-',1,2444) +LexToken(NUMBER,'0.8',1,2445) +LexToken(MULTIPLICATION,'*',1,2448) LexToken(PREVAR_COMPLEX,'%i',1,2449) LexToken(SEMICOLON,';',1,2451) LexToken(NUMBER,'0.3',1,2452) -LexToken(OPERATOR,'+',1,2455) +LexToken(ADDITION,'+',1,2455) LexToken(NUMBER,'0.7',1,2456) -LexToken(OPERATOR,'*',1,2459) +LexToken(MULTIPLICATION,'*',1,2459) LexToken(PREVAR_COMPLEX,'%i',1,2460) LexToken(COMMA,',',1,2462) LexToken(NUMBER,'0.3',1,2463) -LexToken(NUMBER,'-0.7',1,2466) -LexToken(OPERATOR,'*',1,2470) +LexToken(ADDITION,'-',1,2466) +LexToken(NUMBER,'0.7',1,2467) +LexToken(MULTIPLICATION,'*',1,2470) LexToken(PREVAR_COMPLEX,'%i',1,2471) LexToken(CLOSESQBRACKET,']',1,2473) LexToken(EOL,'\n',1,2474) diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index fe61cb27..54b8f204 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -222,13 +222,15 @@ LexToken(VAR,'model',1,1713) LexToken(DOT,'.',1,1718) LexToken(VAR,'in',1,1719) LexToken(ASSIGNMENT,'=',1,1721) -LexToken(NUMBER,'-1',1,1722) +LexToken(ADDITION,'-',1,1722) +LexToken(NUMBER,'1',1,1723) LexToken(EOL,'\n',1,1724) LexToken(VAR,'model',1,1733) LexToken(DOT,'.',1,1738) LexToken(VAR,'out',1,1739) LexToken(ASSIGNMENT,'=',1,1742) -LexToken(NUMBER,'-1',1,1743) +LexToken(ADDITION,'-',1,1743) +LexToken(NUMBER,'1',1,1744) LexToken(EOL,'\n',1,1745) LexToken(VAR,'model',1,1754) LexToken(DOT,'.',1,1759) diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index abe146d6..e910253f 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -227,25 +227,29 @@ LexToken(VAR,'model',1,1723) LexToken(DOT,'.',1,1728) LexToken(VAR,'in',1,1729) LexToken(ASSIGNMENT,'=',1,1731) -LexToken(NUMBER,'-1',1,1732) +LexToken(ADDITION,'-',1,1732) +LexToken(NUMBER,'1',1,1733) LexToken(EOL,'\n',1,1734) LexToken(VAR,'model',1,1743) LexToken(DOT,'.',1,1748) LexToken(VAR,'in2',1,1749) LexToken(ASSIGNMENT,'=',1,1752) -LexToken(NUMBER,'-2',1,1753) +LexToken(ADDITION,'-',1,1753) +LexToken(NUMBER,'2',1,1754) LexToken(EOL,'\n',1,1755) LexToken(VAR,'model',1,1764) LexToken(DOT,'.',1,1769) LexToken(VAR,'out',1,1770) LexToken(ASSIGNMENT,'=',1,1773) -LexToken(NUMBER,'-1',1,1774) +LexToken(ADDITION,'-',1,1774) +LexToken(NUMBER,'1',1,1775) LexToken(EOL,'\n',1,1776) LexToken(VAR,'model',1,1785) LexToken(DOT,'.',1,1790) LexToken(VAR,'out2',1,1791) LexToken(ASSIGNMENT,'=',1,1795) -LexToken(NUMBER,'-2',1,1796) +LexToken(ADDITION,'-',1,1796) +LexToken(NUMBER,'2',1,1797) LexToken(EOL,'\n',1,1798) LexToken(VAR,'model',1,1807) LexToken(DOT,'.',1,1812) diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 67f2cc0d..54957707 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -119,18 +119,22 @@ LexToken(VAR,'list',1,1201) LexToken(OPENBRACKET,'(',1,1205) LexToken(DQSTRING,'"vec"',1,1210) LexToken(COMMA,',',1,1211) -LexToken(NUMBER,'-1',1,1212) +LexToken(ADDITION,'-',1,1212) +LexToken(NUMBER,'1',1,1213) LexToken(COMMA,',',1,1214) LexToken(DQSTRING,'"vec"',1,1219) LexToken(COMMA,',',1,1220) -LexToken(NUMBER,'-1',1,1221) +LexToken(ADDITION,'-',1,1221) +LexToken(NUMBER,'1',1,1222) LexToken(COMMA,',',1,1223) LexToken(DQSTRING,'"mat"',1,1228) LexToken(COMMA,',',1,1229) LexToken(OPENSQBRACKET,'[',1,1230) -LexToken(NUMBER,'-1',1,1231) +LexToken(ADDITION,'-',1,1231) +LexToken(NUMBER,'1',1,1232) LexToken(COMMA,',',1,1233) -LexToken(NUMBER,'-1',1,1234) +LexToken(ADDITION,'-',1,1234) +LexToken(NUMBER,'1',1,1235) LexToken(CLOSESQBRACKET,']',1,1236) LexToken(CLOSEBRACKET,')',1,1237) LexToken(COMMA,',',1,1238) @@ -191,13 +195,14 @@ LexToken(NUMBER,'2',1,1460) LexToken(COLON,':',1,1461) LexToken(LASTINDEX,'$',1,1462) LexToken(CLOSEBRACKET,')',1,1463) -LexToken(OPERATOR,'-',1,1464) +LexToken(ADDITION,'-',1,1464) LexToken(VAR,'a',1,1465) LexToken(OPENBRACKET,'(',1,1466) LexToken(NUMBER,'1',1,1467) LexToken(COLON,':',1,1468) LexToken(LASTINDEX,'$',1,1469) -LexToken(NUMBER,'-1',1,1470) +LexToken(ADDITION,'-',1,1470) +LexToken(NUMBER,'1',1,1471) LexToken(CLOSEBRACKET,')',1,1472) LexToken(CLOSEBRACKET,')',1,1473) LexToken(COMPARISON,'<=',1,1475) @@ -211,13 +216,14 @@ LexToken(NUMBER,'2',1,1487) LexToken(COLON,':',1,1488) LexToken(LASTINDEX,'$',1,1489) LexToken(CLOSEBRACKET,')',1,1490) -LexToken(OPERATOR,'-',1,1491) +LexToken(ADDITION,'-',1,1491) LexToken(VAR,'b',1,1492) LexToken(OPENBRACKET,'(',1,1493) LexToken(NUMBER,'1',1,1494) LexToken(COLON,':',1,1495) LexToken(LASTINDEX,'$',1,1496) -LexToken(NUMBER,'-1',1,1497) +LexToken(ADDITION,'-',1,1497) +LexToken(NUMBER,'1',1,1498) LexToken(CLOSEBRACKET,')',1,1499) LexToken(CLOSEBRACKET,')',1,1500) LexToken(COMPARISON,'<=',1,1502) diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 28f981eb..42f5d2b7 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -115,11 +115,13 @@ LexToken(VAR,'list',1,1188) LexToken(OPENBRACKET,'(',1,1192) LexToken(DQSTRING,'"vec"',1,1197) LexToken(COMMA,',',1,1198) -LexToken(NUMBER,'-1',1,1199) +LexToken(ADDITION,'-',1,1199) +LexToken(NUMBER,'1',1,1200) LexToken(COMMA,',',1,1201) LexToken(DQSTRING,'"vec"',1,1206) LexToken(COMMA,',',1,1207) -LexToken(NUMBER,'-1',1,1208) +LexToken(ADDITION,'-',1,1208) +LexToken(NUMBER,'1',1,1209) LexToken(CLOSEBRACKET,')',1,1210) LexToken(COMMA,',',1,1211) LexToken(VAR,'exprs',1,1212) @@ -165,13 +167,14 @@ LexToken(NUMBER,'2',1,1413) LexToken(COLON,':',1,1414) LexToken(LASTINDEX,'$',1,1415) LexToken(CLOSEBRACKET,')',1,1416) -LexToken(OPERATOR,'-',1,1417) +LexToken(ADDITION,'-',1,1417) LexToken(VAR,'a',1,1418) LexToken(OPENBRACKET,'(',1,1419) LexToken(NUMBER,'1',1,1420) LexToken(COLON,':',1,1421) LexToken(LASTINDEX,'$',1,1422) -LexToken(NUMBER,'-1',1,1423) +LexToken(ADDITION,'-',1,1423) +LexToken(NUMBER,'1',1,1424) LexToken(CLOSEBRACKET,')',1,1425) LexToken(CLOSEBRACKET,')',1,1426) LexToken(COMPARISON,'<=',1,1428) diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 66f807bf..fab3e021 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -73,7 +73,8 @@ LexToken(THEN,'then',1,975) LexToken(EOL,'\n',1,979) LexToken(VAR,'in',1,988) LexToken(ASSIGNMENT,'=',1,990) -LexToken(NUMBER,'-1',1,991) +LexToken(ADDITION,'-',1,991) +LexToken(NUMBER,'1',1,992) LexToken(EOL,'\n',1,993) LexToken(VAR,'model',1,1002) LexToken(ASSIGNMENT,'=',1,1007) diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 7518238e..7631eeb4 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -73,7 +73,8 @@ LexToken(THEN,'then',1,977) LexToken(EOL,'\n',1,981) LexToken(VAR,'in',1,990) LexToken(ASSIGNMENT,'=',1,992) -LexToken(NUMBER,'-1',1,993) +LexToken(ADDITION,'-',1,993) +LexToken(NUMBER,'1',1,994) LexToken(EOL,'\n',1,995) LexToken(VAR,'model',1,1004) LexToken(ASSIGNMENT,'=',1,1009) diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 6b54dadf..d42bdcbe 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -224,13 +224,15 @@ LexToken(VAR,'model',1,1797) LexToken(DOT,'.',1,1802) LexToken(VAR,'in',1,1803) LexToken(ASSIGNMENT,'=',1,1805) -LexToken(NUMBER,'-1',1,1806) +LexToken(ADDITION,'-',1,1806) +LexToken(NUMBER,'1',1,1807) LexToken(EOL,'\n',1,1808) LexToken(VAR,'model',1,1817) LexToken(DOT,'.',1,1822) LexToken(VAR,'out',1,1823) LexToken(ASSIGNMENT,'=',1,1826) -LexToken(NUMBER,'-1',1,1827) +LexToken(ADDITION,'-',1,1827) +LexToken(NUMBER,'1',1,1828) LexToken(EOL,'\n',1,1829) LexToken(VAR,'model',1,1838) LexToken(DOT,'.',1,1843) diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 0a2d622c..58321efb 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -140,18 +140,22 @@ LexToken(VAR,'list',1,1357) LexToken(OPENBRACKET,'(',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) -LexToken(NUMBER,'-1',1,1377) +LexToken(ADDITION,'-',1,1377) +LexToken(NUMBER,'1',1,1378) LexToken(COMMA,',',1,1379) LexToken(DQSTRING,'"mat"',1,1384) LexToken(COMMA,',',1,1385) LexToken(OPENSQBRACKET,'[',1,1386) -LexToken(NUMBER,'-1',1,1387) +LexToken(ADDITION,'-',1,1387) +LexToken(NUMBER,'1',1,1388) LexToken(COMMA,',',1,1389) -LexToken(NUMBER,'-1',1,1390) +LexToken(ADDITION,'-',1,1390) +LexToken(NUMBER,'1',1,1391) LexToken(CLOSESQBRACKET,']',1,1392) LexToken(COMMA,',',1,1393) LexToken(DQSTRING,'"vec"',1,1398) @@ -495,7 +499,7 @@ LexToken(VAR,'winsid',1,3365) LexToken(OPENBRACKET,'(',1,3371) LexToken(CLOSEBRACKET,')',1,3372) LexToken(CLOSEBRACKET,')',1,3373) -LexToken(OPERATOR,'+',1,3374) +LexToken(ADDITION,'+',1,3374) LexToken(NUMBER,'1',1,3375) LexToken(SEMICOLON,';',1,3376) LexToken(EOL,'\n',1,3377) @@ -649,7 +653,8 @@ LexToken(NUMBER,'6',1,3985) LexToken(COMMA,',',1,3986) LexToken(NUMBER,'3',1,3988) LexToken(COMMA,',',1,3989) -LexToken(NUMBER,'-1',1,3990) +LexToken(ADDITION,'-',1,3990) +LexToken(NUMBER,'1',1,3991) LexToken(CLOSESQBRACKET,']',1,3992) LexToken(SEMICOLON,';',1,3993) LexToken(EOL,'\n',1,3994) @@ -869,12 +874,12 @@ LexToken(EOL,'\n',1,4620) LexToken(VAR,'xinfo',1,4633) LexToken(OPENBRACKET,'(',1,4638) LexToken(DQSTRING,'"x contains no data in x("',1,4664) -LexToken(OPERATOR,'+',1,4665) +LexToken(ADDITION,'+',1,4665) LexToken(VAR,'string',1,4666) LexToken(OPENBRACKET,'(',1,4672) LexToken(VAR,'i',1,4673) LexToken(CLOSEBRACKET,')',1,4674) -LexToken(OPERATOR,'+',1,4675) +LexToken(ADDITION,'+',1,4675) LexToken(DQSTRING,'")"',1,4678) LexToken(CLOSEBRACKET,')',1,4679) LexToken(SEMICOLON,';',1,4680) @@ -894,7 +899,8 @@ LexToken(ASSIGNMENT,'=',1,4733) LexToken(NUMBER,'1',1,4734) LexToken(COLON,':',1,4735) LexToken(VAR,'mx',1,4736) -LexToken(NUMBER,'-1',1,4738) +LexToken(ADDITION,'-',1,4738) +LexToken(NUMBER,'1',1,4739) LexToken(EOL,'\n',1,4740) LexToken(IF,'if',1,4749) LexToken(OPENBRACKET,'(',1,4752) @@ -906,7 +912,7 @@ LexToken(COMPARISON,'>',1,4758) LexToken(VAR,'xx',1,4759) LexToken(OPENBRACKET,'(',1,4761) LexToken(VAR,'i',1,4762) -LexToken(OPERATOR,'+',1,4763) +LexToken(ADDITION,'+',1,4763) LexToken(NUMBER,'1',1,4764) LexToken(CLOSEBRACKET,')',1,4765) LexToken(CLOSEBRACKET,')',1,4766) diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index db784326..75b3c483 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -146,11 +146,13 @@ LexToken(NUMBER,'1',1,1489) LexToken(COMMA,',',1,1490) LexToken(DQSTRING,'"vec"',1,1495) LexToken(COMMA,',',1,1496) -LexToken(NUMBER,'-1',1,1497) +LexToken(ADDITION,'-',1,1497) +LexToken(NUMBER,'1',1,1498) LexToken(COMMA,',',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) @@ -480,7 +482,7 @@ LexToken(VAR,'winsid',1,3289) LexToken(OPENBRACKET,'(',1,3295) LexToken(CLOSEBRACKET,')',1,3296) LexToken(CLOSEBRACKET,')',1,3297) -LexToken(OPERATOR,'+',1,3298) +LexToken(ADDITION,'+',1,3298) LexToken(NUMBER,'1',1,3299) LexToken(SEMICOLON,';',1,3300) LexToken(EOL,'\n',1,3301) @@ -541,11 +543,11 @@ LexToken(COMMA,',',1,3633) LexToken(VAR,'orpar',1,3634) LexToken(OPENBRACKET,'(',1,3639) LexToken(VAR,'N2',1,3640) -LexToken(OPERATOR,'+',1,3642) +LexToken(ADDITION,'+',1,3642) LexToken(NUMBER,'1',1,3643) LexToken(COLON,':',1,3644) LexToken(NUMBER,'2',1,3645) -LexToken(OPERATOR,'*',1,3646) +LexToken(MULTIPLICATION,'*',1,3646) LexToken(VAR,'N2',1,3647) LexToken(CLOSEBRACKET,')',1,3649) LexToken(CLOSESQBRACKET,']',1,3650) @@ -607,7 +609,8 @@ LexToken(OPENBRACKET,'(',1,3917) LexToken(NUMBER,'1',1,3918) LexToken(COLON,':',1,3919) LexToken(VAR,'N',1,3920) -LexToken(NUMBER,'-1',1,3921) +LexToken(ADDITION,'-',1,3921) +LexToken(NUMBER,'1',1,3922) LexToken(COMMA,',',1,3923) LexToken(NUMBER,'2',1,3924) LexToken(CLOSEBRACKET,')',1,3925) @@ -617,7 +620,8 @@ LexToken(OPENBRACKET,'(',1,3931) LexToken(NUMBER,'1',1,3932) LexToken(COLON,':',1,3933) LexToken(VAR,'N2',1,3934) -LexToken(NUMBER,'-1',1,3936) +LexToken(ADDITION,'-',1,3936) +LexToken(NUMBER,'1',1,3937) LexToken(COMMA,',',1,3938) LexToken(NUMBER,'2',1,3939) LexToken(CLOSEBRACKET,')',1,3940) @@ -1011,7 +1015,8 @@ LexToken(VAR,'model',1,5919) LexToken(DOT,'.',1,5924) LexToken(VAR,'firing',1,5925) LexToken(ASSIGNMENT,'=',1,5931) -LexToken(NUMBER,'-1',1,5932) +LexToken(ADDITION,'-',1,5932) +LexToken(NUMBER,'1',1,5933) LexToken(SEMICOLON,';',1,5934) LexToken(EOL,'\n',1,5935) LexToken(END,'end',1,5952) @@ -1067,7 +1072,8 @@ LexToken(EOL,'\n',1,6228) LexToken(VAR,'xx',1,6237) LexToken(ASSIGNMENT,'=',1,6239) LexToken(OPENSQBRACKET,'[',1,6240) -LexToken(NUMBER,'-1',1,6241) +LexToken(ADDITION,'-',1,6241) +LexToken(NUMBER,'1',1,6242) LexToken(SEMICOLON,';',1,6243) LexToken(NUMBER,'0.5',1,6244) LexToken(SEMICOLON,';',1,6247) @@ -1081,15 +1087,19 @@ LexToken(EOL,'\n',1,6258) LexToken(VAR,'yy',1,6267) LexToken(ASSIGNMENT,'=',1,6269) LexToken(OPENSQBRACKET,'[',1,6270) -LexToken(NUMBER,'-6',1,6271) +LexToken(ADDITION,'-',1,6271) +LexToken(NUMBER,'6',1,6272) LexToken(SEMICOLON,';',1,6273) -LexToken(NUMBER,'-1',1,6274) +LexToken(ADDITION,'-',1,6274) +LexToken(NUMBER,'1',1,6275) LexToken(SEMICOLON,';',1,6276) -LexToken(NUMBER,'-3',1,6277) +LexToken(ADDITION,'-',1,6277) +LexToken(NUMBER,'3',1,6278) LexToken(SEMICOLON,';',1,6279) LexToken(NUMBER,'3',1,6280) LexToken(SEMICOLON,';',1,6281) -LexToken(NUMBER,'-4',1,6282) +LexToken(ADDITION,'-',1,6282) +LexToken(NUMBER,'4',1,6283) LexToken(CLOSESQBRACKET,']',1,6284) LexToken(EOL,'\n',1,6285) LexToken(VAR,'N',1,6294) @@ -1124,38 +1134,44 @@ LexToken(VAR,'model',1,6388) LexToken(DOT,'.',1,6393) LexToken(VAR,'in',1,6394) LexToken(ASSIGNMENT,'=',1,6396) -LexToken(NUMBER,'-1',1,6397) +LexToken(ADDITION,'-',1,6397) +LexToken(NUMBER,'1',1,6398) LexToken(EOL,'\n',1,6399) LexToken(VAR,'model',1,6408) LexToken(DOT,'.',1,6413) LexToken(VAR,'in2',1,6414) LexToken(ASSIGNMENT,'=',1,6417) -LexToken(NUMBER,'-2',1,6418) +LexToken(ADDITION,'-',1,6418) +LexToken(NUMBER,'2',1,6419) LexToken(EOL,'\n',1,6420) LexToken(VAR,'model',1,6429) LexToken(DOT,'.',1,6434) LexToken(VAR,'outtyp',1,6435) LexToken(ASSIGNMENT,'=',1,6441) -LexToken(NUMBER,'-1',1,6442) +LexToken(ADDITION,'-',1,6442) +LexToken(NUMBER,'1',1,6443) LexToken(EOL,'\n',1,6444) LexToken(EOL,'\n',1,6445) LexToken(VAR,'model',1,6454) LexToken(DOT,'.',1,6459) LexToken(VAR,'out',1,6460) LexToken(ASSIGNMENT,'=',1,6463) -LexToken(NUMBER,'-1',1,6464) +LexToken(ADDITION,'-',1,6464) +LexToken(NUMBER,'1',1,6465) LexToken(EOL,'\n',1,6466) LexToken(VAR,'model',1,6475) LexToken(DOT,'.',1,6480) LexToken(VAR,'out2',1,6481) LexToken(ASSIGNMENT,'=',1,6485) -LexToken(NUMBER,'-2',1,6486) +LexToken(ADDITION,'-',1,6486) +LexToken(NUMBER,'2',1,6487) LexToken(EOL,'\n',1,6488) LexToken(VAR,'model',1,6497) LexToken(DOT,'.',1,6502) LexToken(VAR,'outtyp',1,6503) LexToken(ASSIGNMENT,'=',1,6509) -LexToken(NUMBER,'-1',1,6510) +LexToken(ADDITION,'-',1,6510) +LexToken(NUMBER,'1',1,6511) LexToken(EOL,'\n',1,6512) LexToken(EOL,'\n',1,6513) LexToken(VAR,'model',1,6522) @@ -1910,14 +1926,14 @@ LexToken(EOL,'\n',1,9310) LexToken(VAR,'dx',1,9315) LexToken(ASSIGNMENT,'=',1,9317) LexToken(VAR,'xmx',1,9318) -LexToken(OPERATOR,'-',1,9321) +LexToken(ADDITION,'-',1,9321) LexToken(VAR,'xmn',1,9322) LexToken(SEMICOLON,';',1,9325) LexToken(EOL,'\n',1,9326) LexToken(VAR,'dy',1,9331) LexToken(ASSIGNMENT,'=',1,9333) LexToken(VAR,'ymx',1,9334) -LexToken(OPERATOR,'-',1,9337) +LexToken(ADDITION,'-',1,9337) LexToken(VAR,'ymn',1,9338) LexToken(EOL,'\n',1,9341) LexToken(IF,'if',1,9346) @@ -1931,7 +1947,7 @@ LexToken(ASSIGNMENT,'=',1,9370) LexToken(VAR,'max',1,9371) LexToken(OPENBRACKET,'(',1,9374) LexToken(VAR,'xmx',1,9375) -LexToken(OPERATOR,'/',1,9378) +LexToken(MULTIPLICATION,'/',1,9378) LexToken(NUMBER,'2',1,9379) LexToken(COMMA,',',1,9380) LexToken(NUMBER,'1',1,9381) @@ -1944,9 +1960,9 @@ LexToken(EOL,'\n',1,9393) LexToken(VAR,'xmx',1,9398) LexToken(ASSIGNMENT,'=',1,9401) LexToken(VAR,'xmx',1,9402) -LexToken(OPERATOR,'+',1,9405) +LexToken(ADDITION,'+',1,9405) LexToken(VAR,'dx',1,9406) -LexToken(OPERATOR,'/',1,9408) +LexToken(MULTIPLICATION,'/',1,9408) LexToken(NUMBER,'50',1,9409) LexToken(SEMICOLON,';',1,9411) LexToken(EOL,'\n',1,9412) @@ -1961,7 +1977,7 @@ LexToken(ASSIGNMENT,'=',1,9441) LexToken(VAR,'max',1,9442) LexToken(OPENBRACKET,'(',1,9445) LexToken(VAR,'ymx',1,9446) -LexToken(OPERATOR,'/',1,9449) +LexToken(MULTIPLICATION,'/',1,9449) LexToken(NUMBER,'2',1,9450) LexToken(COMMA,',',1,9451) LexToken(NUMBER,'1',1,9452) @@ -1974,18 +1990,18 @@ LexToken(EOL,'\n',1,9464) LexToken(VAR,'ymn',1,9469) LexToken(ASSIGNMENT,'=',1,9472) LexToken(VAR,'ymn',1,9473) -LexToken(OPERATOR,'-',1,9476) +LexToken(ADDITION,'-',1,9476) LexToken(VAR,'dy',1,9477) -LexToken(OPERATOR,'/',1,9479) +LexToken(MULTIPLICATION,'/',1,9479) LexToken(NUMBER,'50',1,9480) LexToken(SEMICOLON,';',1,9482) LexToken(EOL,'\n',1,9483) LexToken(VAR,'ymx',1,9488) LexToken(ASSIGNMENT,'=',1,9491) LexToken(VAR,'ymx',1,9492) -LexToken(OPERATOR,'+',1,9495) +LexToken(ADDITION,'+',1,9495) LexToken(VAR,'dy',1,9496) -LexToken(OPERATOR,'/',1,9498) +LexToken(MULTIPLICATION,'/',1,9498) LexToken(NUMBER,'50',1,9499) LexToken(SEMICOLON,';',1,9501) LexToken(EOL,'\n',1,9502) @@ -2251,7 +2267,7 @@ LexToken(OPENBRACKET,'(',1,10803) LexToken(VAR,'menu_o',1,10804) LexToken(CLOSEBRACKET,')',1,10810) LexToken(CLOSEBRACKET,')',1,10811) -LexToken(OPERATOR,'+',1,10812) +LexToken(ADDITION,'+',1,10812) LexToken(VAR,'string',1,10813) LexToken(OPENBRACKET,'(',1,10819) LexToken(NUMBER,'1',1,10820) @@ -2263,7 +2279,7 @@ LexToken(COMMA,',',1,10833) LexToken(DQSTRING,'"*"',1,10836) LexToken(CLOSEBRACKET,')',1,10837) LexToken(CLOSEBRACKET,')',1,10838) -LexToken(OPERATOR,'+',1,10839) +LexToken(ADDITION,'+',1,10839) LexToken(VAR,'r',1,10840) LexToken(OPENBRACKET,'(',1,10841) LexToken(VAR,'ones',1,10842) @@ -2290,7 +2306,7 @@ LexToken(OPENBRACKET,'(',1,10897) LexToken(VAR,'menu_d',1,10898) LexToken(CLOSEBRACKET,')',1,10904) LexToken(CLOSEBRACKET,')',1,10905) -LexToken(OPERATOR,'+',1,10906) +LexToken(ADDITION,'+',1,10906) LexToken(VAR,'string',1,10907) LexToken(OPENBRACKET,'(',1,10913) LexToken(NUMBER,'1',1,10914) @@ -2302,7 +2318,7 @@ LexToken(COMMA,',',1,10927) LexToken(DQSTRING,'"*"',1,10930) LexToken(CLOSEBRACKET,')',1,10931) LexToken(CLOSEBRACKET,')',1,10932) -LexToken(OPERATOR,'+',1,10933) +LexToken(ADDITION,'+',1,10933) LexToken(VAR,'r',1,10934) LexToken(OPENBRACKET,'(',1,10935) LexToken(VAR,'ones',1,10936) @@ -2329,7 +2345,7 @@ LexToken(OPENBRACKET,'(',1,10992) LexToken(VAR,'menu_t',1,10993) LexToken(CLOSEBRACKET,')',1,10999) LexToken(CLOSEBRACKET,')',1,11000) -LexToken(OPERATOR,'+',1,11001) +LexToken(ADDITION,'+',1,11001) LexToken(VAR,'string',1,11002) LexToken(OPENBRACKET,'(',1,11008) LexToken(NUMBER,'1',1,11009) @@ -2341,7 +2357,7 @@ LexToken(COMMA,',',1,11022) LexToken(DQSTRING,'"*"',1,11025) LexToken(CLOSEBRACKET,')',1,11026) LexToken(CLOSEBRACKET,')',1,11027) -LexToken(OPERATOR,'+',1,11028) +LexToken(ADDITION,'+',1,11028) LexToken(VAR,'r',1,11029) LexToken(OPENBRACKET,'(',1,11030) LexToken(VAR,'ones',1,11031) @@ -2368,7 +2384,7 @@ LexToken(OPENBRACKET,'(',1,11086) LexToken(VAR,'menu_e',1,11087) LexToken(CLOSEBRACKET,')',1,11093) LexToken(CLOSEBRACKET,')',1,11094) -LexToken(OPERATOR,'+',1,11095) +LexToken(ADDITION,'+',1,11095) LexToken(VAR,'string',1,11096) LexToken(OPENBRACKET,'(',1,11102) LexToken(NUMBER,'1',1,11103) @@ -2380,7 +2396,7 @@ LexToken(COMMA,',',1,11116) LexToken(DQSTRING,'"*"',1,11119) LexToken(CLOSEBRACKET,')',1,11120) LexToken(CLOSEBRACKET,')',1,11121) -LexToken(OPERATOR,'+',1,11122) +LexToken(ADDITION,'+',1,11122) LexToken(VAR,'r',1,11123) LexToken(OPENBRACKET,'(',1,11124) LexToken(VAR,'ones',1,11125) @@ -2393,60 +2409,60 @@ LexToken(EOL,'\n',1,11139) LexToken(VAR,'execstr',1,11144) LexToken(OPENBRACKET,'(',1,11151) LexToken(DQSTRING,'"Autoscale_"',1,11163) -LexToken(OPERATOR,'+',1,11164) +LexToken(ADDITION,'+',1,11164) LexToken(VAR,'string',1,11165) LexToken(OPENBRACKET,'(',1,11171) LexToken(VAR,'curwin',1,11172) LexToken(CLOSEBRACKET,')',1,11178) -LexToken(OPERATOR,'+',1,11179) +LexToken(ADDITION,'+',1,11179) LexToken(DQSTRING,'"=scam"',1,11186) LexToken(CLOSEBRACKET,')',1,11187) LexToken(EOL,'\n',1,11188) LexToken(VAR,'execstr',1,11193) LexToken(OPENBRACKET,'(',1,11200) LexToken(DQSTRING,'"Spline_"',1,11209) -LexToken(OPERATOR,'+',1,11210) +LexToken(ADDITION,'+',1,11210) LexToken(VAR,'string',1,11211) LexToken(OPENBRACKET,'(',1,11217) LexToken(VAR,'curwin',1,11218) LexToken(CLOSEBRACKET,')',1,11224) -LexToken(OPERATOR,'+',1,11225) +LexToken(ADDITION,'+',1,11225) LexToken(DQSTRING,'"=Orderm"',1,11234) LexToken(CLOSEBRACKET,')',1,11235) LexToken(EOL,'\n',1,11236) LexToken(VAR,'execstr',1,11241) LexToken(OPENBRACKET,'(',1,11248) LexToken(DQSTRING,'"Data_"',1,11255) -LexToken(OPERATOR,'+',1,11256) +LexToken(ADDITION,'+',1,11256) LexToken(VAR,'string',1,11257) LexToken(OPENBRACKET,'(',1,11263) LexToken(VAR,'curwin',1,11264) LexToken(CLOSEBRACKET,')',1,11270) -LexToken(OPERATOR,'+',1,11271) +LexToken(ADDITION,'+',1,11271) LexToken(DQSTRING,'"=Datam"',1,11279) LexToken(CLOSEBRACKET,')',1,11280) LexToken(EOL,'\n',1,11281) LexToken(VAR,'execstr',1,11286) LexToken(OPENBRACKET,'(',1,11293) LexToken(DQSTRING,'"Standards_"',1,11305) -LexToken(OPERATOR,'+',1,11306) +LexToken(ADDITION,'+',1,11306) LexToken(VAR,'string',1,11307) LexToken(OPENBRACKET,'(',1,11313) LexToken(VAR,'curwin',1,11314) LexToken(CLOSEBRACKET,')',1,11320) -LexToken(OPERATOR,'+',1,11321) +LexToken(ADDITION,'+',1,11321) LexToken(DQSTRING,'"=Standm"',1,11330) LexToken(CLOSEBRACKET,')',1,11331) LexToken(EOL,'\n',1,11332) LexToken(VAR,'execstr',1,11337) LexToken(OPENBRACKET,'(',1,11344) LexToken(DQSTRING,'"Exit_"',1,11351) -LexToken(OPERATOR,'+',1,11352) +LexToken(ADDITION,'+',1,11352) LexToken(VAR,'string',1,11353) LexToken(OPENBRACKET,'(',1,11359) LexToken(VAR,'curwin',1,11360) LexToken(CLOSEBRACKET,')',1,11366) -LexToken(OPERATOR,'+',1,11367) +LexToken(ADDITION,'+',1,11367) LexToken(DQSTRING,'"=Exitm"',1,11375) LexToken(CLOSEBRACKET,')',1,11376) LexToken(EOL,'\n',1,11377) @@ -2610,7 +2626,8 @@ LexToken(NUMBER,'2',1,11900) LexToken(CLOSEBRACKET,')',1,11901) LexToken(COMMA,',',1,11902) LexToken(OPENSQBRACKET,'[',1,11903) -LexToken(NUMBER,'-1',1,11904) +LexToken(ADDITION,'-',1,11904) +LexToken(NUMBER,'1',1,11905) LexToken(CLOSESQBRACKET,']',1,11906) LexToken(CLOSEBRACKET,')',1,11907) LexToken(SEMICOLON,';',1,11908) @@ -3365,9 +3382,9 @@ LexToken(OPENBRACKET,'(',1,15902) LexToken(NUMBER,'0',1,15903) LexToken(COMMA,',',1,15904) LexToken(PREVAR_FLOAT,'%pi',1,15905) -LexToken(OPERATOR,'*',1,15908) +LexToken(MULTIPLICATION,'*',1,15908) LexToken(NUMBER,'2',1,15909) -LexToken(OPERATOR,'/',1,15910) +LexToken(MULTIPLICATION,'/',1,15910) LexToken(VAR,'wp',1,15911) LexToken(COMMA,',',1,15913) LexToken(VAR,'np1',1,15914) @@ -3378,16 +3395,16 @@ LexToken(EOL,'\n',1,15920) LexToken(VAR,'yt',1,15937) LexToken(ASSIGNMENT,'=',1,15939) LexToken(VAR,'Amp',1,15940) -LexToken(OPERATOR,'*',1,15943) +LexToken(MULTIPLICATION,'*',1,15943) LexToken(VAR,'sin',1,15944) LexToken(OPENBRACKET,'(',1,15947) LexToken(VAR,'wp',1,15948) -LexToken(OPERATOR,'*',1,15950) +LexToken(MULTIPLICATION,'*',1,15950) LexToken(VAR,'xt',1,15951) -LexToken(OPERATOR,'+',1,15953) +LexToken(ADDITION,'+',1,15953) LexToken(VAR,'phase',1,15954) LexToken(CLOSEBRACKET,')',1,15959) -LexToken(OPERATOR,'+',1,15960) +LexToken(ADDITION,'+',1,15960) LexToken(VAR,'offset',1,15961) LexToken(SEMICOLON,';',1,15967) LexToken(EOL,'\n',1,15968) @@ -3644,7 +3661,7 @@ LexToken(ASSIGNMENT,'=',1,17264) LexToken(OPENSQBRACKET,'[',1,17265) LexToken(VAR,'sAmp2',1,17266) LexToken(SEMICOLON,';',1,17271) -LexToken(OPERATOR,'-',1,17272) +LexToken(ADDITION,'-',1,17272) LexToken(VAR,'sAmp2',1,17273) LexToken(CLOSESQBRACKET,']',1,17278) LexToken(SEMICOLON,';',1,17279) @@ -3821,11 +3838,11 @@ LexToken(SEMICOLON,';',1,18251) LexToken(VAR,'Pd3',1,18252) LexToken(SEMICOLON,';',1,18255) LexToken(VAR,'Pw3',1,18257) -LexToken(OPERATOR,'*',1,18260) +LexToken(MULTIPLICATION,'*',1,18260) LexToken(VAR,'Tp3',1,18261) -LexToken(OPERATOR,'/',1,18264) +LexToken(MULTIPLICATION,'/',1,18264) LexToken(NUMBER,'100',1,18265) -LexToken(OPERATOR,'+',1,18268) +LexToken(ADDITION,'+',1,18268) LexToken(VAR,'Pd3',1,18269) LexToken(SEMICOLON,';',1,18272) LexToken(VAR,'Tp3',1,18273) @@ -3838,7 +3855,7 @@ LexToken(OPENSQBRACKET,'[',1,18306) LexToken(VAR,'yt',1,18307) LexToken(SEMICOLON,';',1,18309) LexToken(VAR,'Amp3',1,18310) -LexToken(OPERATOR,'+',1,18314) +LexToken(ADDITION,'+',1,18314) LexToken(VAR,'Bias3',1,18315) LexToken(SEMICOLON,';',1,18320) LexToken(VAR,'Bias3',1,18321) @@ -4031,10 +4048,11 @@ LexToken(COLON,':',1,19307) LexToken(VAR,'sample4',1,19308) LexToken(COLON,':',1,19315) LexToken(VAR,'sample4',1,19316) -LexToken(OPERATOR,'*',1,19323) +LexToken(MULTIPLICATION,'*',1,19323) LexToken(OPENBRACKET,'(',1,19324) LexToken(VAR,'np4',1,19325) -LexToken(NUMBER,'-1',1,19328) +LexToken(ADDITION,'-',1,19328) +LexToken(NUMBER,'1',1,19329) LexToken(CLOSEBRACKET,')',1,19330) LexToken(SEMICOLON,';',1,19331) LexToken(EOL,'\n',1,19332) @@ -4049,12 +4067,12 @@ LexToken(EOL,'\n',1,19358) LexToken(VAR,'yt',1,19375) LexToken(ASSIGNMENT,'=',1,19377) LexToken(VAR,'mean4',1,19378) -LexToken(OPERATOR,'+',1,19383) +LexToken(ADDITION,'+',1,19383) LexToken(VAR,'sqrt',1,19384) LexToken(OPENBRACKET,'(',1,19388) LexToken(VAR,'var4',1,19389) LexToken(CLOSEBRACKET,')',1,19393) -LexToken(OPERATOR,'*',1,19394) +LexToken(MULTIPLICATION,'*',1,19394) LexToken(VAR,'rand',1,19395) LexToken(OPENBRACKET,'(',1,19399) LexToken(VAR,'np4',1,19400) @@ -4202,10 +4220,11 @@ LexToken(COLON,':',1,20140) LexToken(VAR,'sample5',1,20141) LexToken(COLON,':',1,20148) LexToken(VAR,'sample5',1,20149) -LexToken(OPERATOR,'*',1,20156) +LexToken(MULTIPLICATION,'*',1,20156) LexToken(OPENBRACKET,'(',1,20157) LexToken(VAR,'np5',1,20158) -LexToken(NUMBER,'-1',1,20161) +LexToken(ADDITION,'-',1,20161) +LexToken(NUMBER,'1',1,20162) LexToken(CLOSEBRACKET,')',1,20163) LexToken(SEMICOLON,';',1,20164) LexToken(EOL,'\n',1,20165) @@ -4220,13 +4239,13 @@ LexToken(EOL,'\n',1,20191) LexToken(VAR,'yt',1,20208) LexToken(ASSIGNMENT,'=',1,20210) LexToken(VAR,'min5',1,20211) -LexToken(OPERATOR,'+',1,20215) +LexToken(ADDITION,'+',1,20215) LexToken(OPENBRACKET,'(',1,20216) LexToken(VAR,'max5',1,20217) -LexToken(OPERATOR,'-',1,20221) +LexToken(ADDITION,'-',1,20221) LexToken(VAR,'min5',1,20222) LexToken(CLOSEBRACKET,')',1,20226) -LexToken(OPERATOR,'*',1,20227) +LexToken(MULTIPLICATION,'*',1,20227) LexToken(VAR,'rand',1,20228) LexToken(OPENBRACKET,'(',1,20232) LexToken(VAR,'np5',1,20233) @@ -4533,11 +4552,13 @@ LexToken(VAR,'list',1,21852) LexToken(OPENBRACKET,'(',1,21856) LexToken(DQSTRING,'"vec"',1,21861) LexToken(COMMA,',',1,21862) -LexToken(NUMBER,'-1',1,21863) +LexToken(ADDITION,'-',1,21863) +LexToken(NUMBER,'1',1,21864) LexToken(COMMA,',',1,21865) LexToken(DQSTRING,'"vec"',1,21870) LexToken(COMMA,',',1,21871) -LexToken(NUMBER,'-1',1,21872) +LexToken(ADDITION,'-',1,21872) +LexToken(NUMBER,'1',1,21873) LexToken(CLOSEBRACKET,')',1,21874) LexToken(COMMA,',',1,21875) LexToken(VAR,'list',1,21876) @@ -4867,35 +4888,35 @@ LexToken(ASSIGNMENT,'=',1,23868) LexToken(OPENBRACKET,'(',1,23869) LexToken(OPENBRACKET,'(',1,23870) LexToken(VAR,'xt',1,23871) -LexToken(OPERATOR,'-',1,23873) +LexToken(ADDITION,'-',1,23873) LexToken(VAR,'ones',1,23874) LexToken(OPENBRACKET,'(',1,23878) LexToken(VAR,'N',1,23879) LexToken(COMMA,',',1,23880) LexToken(NUMBER,'1',1,23881) LexToken(CLOSEBRACKET,')',1,23882) -LexToken(OPERATOR,'*',1,23883) +LexToken(MULTIPLICATION,'*',1,23883) LexToken(VAR,'xc',1,23884) LexToken(CLOSEBRACKET,')',1,23886) LexToken(CLOSEBRACKET,')',1,23887) -LexToken(OPERATOR,'^',1,23888) +LexToken(MULTIPLICATION,'^',1,23888) LexToken(NUMBER,'2',1,23889) -LexToken(OPERATOR,'+',1,23890) +LexToken(ADDITION,'+',1,23890) LexToken(OPENBRACKET,'(',1,23891) LexToken(OPENBRACKET,'(',1,23892) LexToken(VAR,'yt',1,23893) -LexToken(OPERATOR,'-',1,23895) +LexToken(ADDITION,'-',1,23895) LexToken(VAR,'ones',1,23896) LexToken(OPENBRACKET,'(',1,23900) LexToken(VAR,'N',1,23901) LexToken(COMMA,',',1,23902) LexToken(NUMBER,'1',1,23903) LexToken(CLOSEBRACKET,')',1,23904) -LexToken(OPERATOR,'*',1,23905) +LexToken(MULTIPLICATION,'*',1,23905) LexToken(VAR,'yc',1,23906) LexToken(CLOSEBRACKET,')',1,23908) LexToken(CLOSEBRACKET,')',1,23909) -LexToken(OPERATOR,'^',1,23910) +LexToken(MULTIPLICATION,'^',1,23910) LexToken(NUMBER,'2',1,23911) LexToken(EOL,'\n',1,23912) LexToken(OPENSQBRACKET,'[',1,23929) @@ -4927,7 +4948,7 @@ LexToken(NUMBER,'2',1,24014) LexToken(COMMA,',',1,24015) LexToken(NUMBER,'1',1,24016) LexToken(CLOSEBRACKET,')',1,24017) -LexToken(OPERATOR,'-',1,24018) +LexToken(ADDITION,'-',1,24018) LexToken(VAR,'rectx',1,24019) LexToken(OPENBRACKET,'(',1,24024) LexToken(NUMBER,'1',1,24025) @@ -4935,7 +4956,7 @@ LexToken(COMMA,',',1,24026) LexToken(NUMBER,'1',1,24027) LexToken(CLOSEBRACKET,')',1,24028) LexToken(CLOSEBRACKET,')',1,24029) -LexToken(OPERATOR,'/',1,24030) +LexToken(MULTIPLICATION,'/',1,24030) LexToken(NUMBER,'80',1,24031) LexToken(SEMICOLON,';',1,24033) LexToken(EOL,'\n',1,24034) @@ -4949,7 +4970,7 @@ LexToken(NUMBER,'2',1,24064) LexToken(COMMA,',',1,24065) LexToken(NUMBER,'2',1,24066) LexToken(CLOSEBRACKET,')',1,24067) -LexToken(OPERATOR,'-',1,24068) +LexToken(ADDITION,'-',1,24068) LexToken(VAR,'rectx',1,24069) LexToken(OPENBRACKET,'(',1,24074) LexToken(NUMBER,'1',1,24075) @@ -4957,7 +4978,7 @@ LexToken(COMMA,',',1,24076) LexToken(NUMBER,'2',1,24077) LexToken(CLOSEBRACKET,')',1,24078) LexToken(CLOSEBRACKET,')',1,24079) -LexToken(OPERATOR,'/',1,24080) +LexToken(MULTIPLICATION,'/',1,24080) LexToken(NUMBER,'80',1,24081) LexToken(SEMICOLON,';',1,24083) LexToken(EOL,'\n',1,24084) @@ -4966,7 +4987,7 @@ LexToken(OPENBRACKET,'(',1,24104) LexToken(VAR,'abs',1,24105) LexToken(OPENBRACKET,'(',1,24108) LexToken(VAR,'xc',1,24109) -LexToken(OPERATOR,'-',1,24111) +LexToken(ADDITION,'-',1,24111) LexToken(VAR,'xt',1,24112) LexToken(OPENBRACKET,'(',1,24114) LexToken(VAR,'k',1,24115) @@ -4978,7 +4999,7 @@ LexToken(LOGICAL,'&',1,24122) LexToken(VAR,'abs',1,24124) LexToken(OPENBRACKET,'(',1,24127) LexToken(VAR,'yc',1,24128) -LexToken(OPERATOR,'-',1,24130) +LexToken(ADDITION,'-',1,24130) LexToken(VAR,'yt',1,24131) LexToken(OPENBRACKET,'(',1,24133) LexToken(VAR,'k',1,24134) @@ -5454,14 +5475,14 @@ LexToken(EOL,'\n',1,26134) LexToken(VAR,'PERIODIC',1,26143) LexToken(ASSIGNMENT,'=',1,26151) LexToken(DQSTRING,'"periodic, T="',1,26165) -LexToken(OPERATOR,'+',1,26166) +LexToken(ADDITION,'+',1,26166) LexToken(VAR,'string',1,26167) LexToken(OPENBRACKET,'(',1,26173) LexToken(VAR,'x',1,26174) LexToken(OPENBRACKET,'(',1,26175) LexToken(VAR,'N',1,26176) LexToken(CLOSEBRACKET,')',1,26177) -LexToken(OPERATOR,'-',1,26178) +LexToken(ADDITION,'-',1,26178) LexToken(VAR,'x',1,26179) LexToken(OPENBRACKET,'(',1,26180) LexToken(NUMBER,'1',1,26181) @@ -5489,15 +5510,15 @@ LexToken(VAR,'string',1,26251) LexToken(OPENBRACKET,'(',1,26257) LexToken(VAR,'N',1,26258) LexToken(CLOSEBRACKET,')',1,26259) -LexToken(OPERATOR,'+',1,26260) +LexToken(ADDITION,'+',1,26260) LexToken(DQSTRING,'" points, "',1,26272) -LexToken(OPERATOR,'+',1,26273) +LexToken(ADDITION,'+',1,26273) LexToken(DQSTRING,'"Method: "',1,26283) -LexToken(OPERATOR,'+',1,26284) +LexToken(ADDITION,'+',1,26284) LexToken(VAR,'METHOD',1,26285) -LexToken(OPERATOR,'+',1,26291) +LexToken(ADDITION,'+',1,26291) LexToken(DQSTRING,'", "',1,26296) -LexToken(OPERATOR,'+',1,26297) +LexToken(ADDITION,'+',1,26297) LexToken(VAR,'PERIODIC',1,26298) LexToken(CLOSESQBRACKET,']',1,26306) LexToken(SEMICOLON,';',1,26307) @@ -5806,7 +5827,8 @@ LexToken(EOL,'\n',1,27296) LexToken(EOL,'\n',1,27297) LexToken(VAR,'btn',1,27302) LexToken(ASSIGNMENT,'=',1,27305) -LexToken(NUMBER,'-1',1,27306) +LexToken(ADDITION,'-',1,27306) +LexToken(NUMBER,'1',1,27307) LexToken(EOL,'\n',1,27308) LexToken(EOL,'\n',1,27309) LexToken(WHILE,'while',1,27314) @@ -5826,7 +5848,8 @@ LexToken(NUMBER,'10',1,27344) LexToken(LOGICAL,'|',1,27346) LexToken(VAR,'btn',1,27348) LexToken(COMPARISON,'==',1,27351) -LexToken(NUMBER,'-5',1,27353) +LexToken(ADDITION,'-',1,27353) +LexToken(NUMBER,'5',1,27354) LexToken(CLOSEBRACKET,')',1,27355) LexToken(EOL,'\n',1,27356) LexToken(VAR,'rep',1,27365) @@ -6144,14 +6167,14 @@ LexToken(EOL,'\n',1,28209) LexToken(VAR,'dx',1,28214) LexToken(ASSIGNMENT,'=',1,28216) LexToken(VAR,'XMX',1,28217) -LexToken(OPERATOR,'-',1,28220) +LexToken(ADDITION,'-',1,28220) LexToken(VAR,'XMN',1,28221) LexToken(SEMICOLON,';',1,28224) LexToken(EOL,'\n',1,28225) LexToken(VAR,'dy',1,28230) LexToken(ASSIGNMENT,'=',1,28232) LexToken(VAR,'YMX',1,28233) -LexToken(OPERATOR,'-',1,28236) +LexToken(ADDITION,'-',1,28236) LexToken(VAR,'YMN',1,28237) LexToken(EOL,'\n',1,28240) LexToken(IF,'if',1,28245) @@ -6165,7 +6188,7 @@ LexToken(ASSIGNMENT,'=',1,28269) LexToken(VAR,'max',1,28270) LexToken(OPENBRACKET,'(',1,28273) LexToken(VAR,'XMX',1,28274) -LexToken(OPERATOR,'/',1,28277) +LexToken(MULTIPLICATION,'/',1,28277) LexToken(NUMBER,'2',1,28278) LexToken(COMMA,',',1,28279) LexToken(NUMBER,'1',1,28280) @@ -6178,9 +6201,9 @@ LexToken(EOL,'\n',1,28292) LexToken(VAR,'XMX',1,28297) LexToken(ASSIGNMENT,'=',1,28300) LexToken(VAR,'XMX',1,28301) -LexToken(OPERATOR,'+',1,28304) +LexToken(ADDITION,'+',1,28304) LexToken(VAR,'dx',1,28305) -LexToken(OPERATOR,'/',1,28307) +LexToken(MULTIPLICATION,'/',1,28307) LexToken(NUMBER,'50',1,28308) LexToken(EOL,'\n',1,28310) LexToken(IF,'if',1,28315) @@ -6194,7 +6217,7 @@ LexToken(ASSIGNMENT,'=',1,28339) LexToken(VAR,'max',1,28340) LexToken(OPENBRACKET,'(',1,28343) LexToken(VAR,'YMX',1,28344) -LexToken(OPERATOR,'/',1,28347) +LexToken(MULTIPLICATION,'/',1,28347) LexToken(NUMBER,'2',1,28348) LexToken(COMMA,',',1,28349) LexToken(NUMBER,'1',1,28350) @@ -6207,18 +6230,18 @@ LexToken(EOL,'\n',1,28362) LexToken(VAR,'YMN',1,28367) LexToken(ASSIGNMENT,'=',1,28370) LexToken(VAR,'YMN',1,28371) -LexToken(OPERATOR,'-',1,28374) +LexToken(ADDITION,'-',1,28374) LexToken(VAR,'dy',1,28375) -LexToken(OPERATOR,'/',1,28377) +LexToken(MULTIPLICATION,'/',1,28377) LexToken(NUMBER,'50',1,28378) LexToken(SEMICOLON,';',1,28380) LexToken(EOL,'\n',1,28381) LexToken(VAR,'YMX',1,28386) LexToken(ASSIGNMENT,'=',1,28389) LexToken(VAR,'YMX',1,28390) -LexToken(OPERATOR,'+',1,28393) +LexToken(ADDITION,'+',1,28393) LexToken(VAR,'dy',1,28394) -LexToken(OPERATOR,'/',1,28396) +LexToken(MULTIPLICATION,'/',1,28396) LexToken(NUMBER,'50',1,28397) LexToken(SEMICOLON,';',1,28399) LexToken(EOL,'\n',1,28400) @@ -6498,7 +6521,7 @@ LexToken(EOL,'\n',1,29262) LexToken(VAR,'xinfo',1,29275) LexToken(OPENBRACKET,'(',1,29280) LexToken(DQSTRING,'"Scicos cannot find the excel file:"',1,29316) -LexToken(OPERATOR,'+',1,29317) +LexToken(ADDITION,'+',1,29317) LexToken(VAR,'filen',1,29318) LexToken(CLOSEBRACKET,')',1,29323) LexToken(SEMICOLON,';',1,29324) @@ -6612,7 +6635,8 @@ LexToken(COMMA,',',1,29718) LexToken(NUMBER,'1',1,29719) LexToken(COLON,':',1,29720) LexToken(VAR,'px',1,29721) -LexToken(NUMBER,'-1',1,29723) +LexToken(ADDITION,'-',1,29723) +LexToken(NUMBER,'1',1,29724) LexToken(CLOSEBRACKET,')',1,29725) LexToken(SEMICOLON,';',1,29726) LexToken(EOL,'\n',1,29727) @@ -6623,7 +6647,7 @@ LexToken(OPENBRACKET,'(',1,29747) LexToken(VAR,'xa',1,29748) LexToken(COMMA,',',1,29750) LexToken(VAR,'px',1,29751) -LexToken(OPERATOR,'+',1,29753) +LexToken(ADDITION,'+',1,29753) LexToken(NUMBER,'1',1,29754) LexToken(COLON,':',1,29755) LexToken(VAR,'length',1,29756) @@ -6642,7 +6666,8 @@ LexToken(COMMA,',',1,29791) LexToken(NUMBER,'1',1,29792) LexToken(COLON,':',1,29793) LexToken(VAR,'py',1,29794) -LexToken(NUMBER,'-1',1,29796) +LexToken(ADDITION,'-',1,29796) +LexToken(NUMBER,'1',1,29797) LexToken(CLOSEBRACKET,')',1,29798) LexToken(SEMICOLON,';',1,29799) LexToken(EOL,'\n',1,29800) @@ -6653,7 +6678,7 @@ LexToken(OPENBRACKET,'(',1,29820) LexToken(VAR,'ya',1,29821) LexToken(COMMA,',',1,29823) LexToken(VAR,'py',1,29824) -LexToken(OPERATOR,'+',1,29826) +LexToken(ADDITION,'+',1,29826) LexToken(NUMBER,'1',1,29827) LexToken(COLON,':',1,29828) LexToken(VAR,'length',1,29829) @@ -6688,7 +6713,7 @@ LexToken(EOL,'\n',1,29909) LexToken(VAR,'xinfo',1,29926) LexToken(OPENBRACKET,'(',1,29931) LexToken(DQSTRING,'"Bad address in X:"',1,29950) -LexToken(OPERATOR,'+',1,29951) +LexToken(ADDITION,'+',1,29951) LexToken(VAR,'x1',1,29952) LexToken(CLOSEBRACKET,')',1,29954) LexToken(SEMICOLON,';',1,29955) @@ -6707,7 +6732,8 @@ LexToken(COMMA,',',1,30019) LexToken(NUMBER,'1',1,30020) LexToken(COLON,':',1,30021) LexToken(VAR,'x1p',1,30022) -LexToken(NUMBER,'-1',1,30025) +LexToken(ADDITION,'-',1,30025) +LexToken(NUMBER,'1',1,30026) LexToken(CLOSEBRACKET,')',1,30027) LexToken(SEMICOLON,';',1,30028) LexToken(EOL,'\n',1,30029) @@ -6751,7 +6777,7 @@ LexToken(EOL,'\n',1,30138) LexToken(VAR,'xinfo',1,30155) LexToken(OPENBRACKET,'(',1,30160) LexToken(DQSTRING,'"Bad address in X:"',1,30179) -LexToken(OPERATOR,'+',1,30180) +LexToken(ADDITION,'+',1,30180) LexToken(VAR,'x2',1,30181) LexToken(CLOSEBRACKET,')',1,30183) LexToken(SEMICOLON,';',1,30184) @@ -6770,7 +6796,8 @@ LexToken(COMMA,',',1,30248) LexToken(NUMBER,'1',1,30249) LexToken(COLON,':',1,30250) LexToken(VAR,'x2p',1,30251) -LexToken(NUMBER,'-1',1,30254) +LexToken(ADDITION,'-',1,30254) +LexToken(NUMBER,'1',1,30255) LexToken(CLOSEBRACKET,')',1,30256) LexToken(SEMICOLON,';',1,30257) LexToken(EOL,'\n',1,30258) @@ -6814,7 +6841,7 @@ LexToken(EOL,'\n',1,30367) LexToken(VAR,'xinfo',1,30384) LexToken(OPENBRACKET,'(',1,30389) LexToken(DQSTRING,'"Bad address in Y:"',1,30408) -LexToken(OPERATOR,'+',1,30409) +LexToken(ADDITION,'+',1,30409) LexToken(VAR,'y1',1,30410) LexToken(CLOSEBRACKET,')',1,30412) LexToken(SEMICOLON,';',1,30413) @@ -6833,7 +6860,8 @@ LexToken(COMMA,',',1,30477) LexToken(NUMBER,'1',1,30478) LexToken(COLON,':',1,30479) LexToken(VAR,'y1p',1,30480) -LexToken(NUMBER,'-1',1,30483) +LexToken(ADDITION,'-',1,30483) +LexToken(NUMBER,'1',1,30484) LexToken(CLOSEBRACKET,')',1,30485) LexToken(SEMICOLON,';',1,30486) LexToken(EOL,'\n',1,30487) @@ -6877,7 +6905,7 @@ LexToken(EOL,'\n',1,30596) LexToken(VAR,'xinfo',1,30613) LexToken(OPENBRACKET,'(',1,30618) LexToken(DQSTRING,'"Bad address in Y:"',1,30637) -LexToken(OPERATOR,'+',1,30638) +LexToken(ADDITION,'+',1,30638) LexToken(VAR,'y2',1,30639) LexToken(CLOSEBRACKET,')',1,30641) LexToken(SEMICOLON,';',1,30642) @@ -6896,7 +6924,8 @@ LexToken(COMMA,',',1,30706) LexToken(NUMBER,'1',1,30707) LexToken(COLON,':',1,30708) LexToken(VAR,'y2p',1,30709) -LexToken(NUMBER,'-1',1,30712) +LexToken(ADDITION,'-',1,30712) +LexToken(NUMBER,'1',1,30713) LexToken(CLOSEBRACKET,')',1,30714) LexToken(SEMICOLON,';',1,30715) LexToken(EOL,'\n',1,30716) @@ -6965,7 +6994,7 @@ LexToken(EOL,'\n',1,30956) LexToken(VAR,'xstC',1,30973) LexToken(ASSIGNMENT,'=',1,30977) LexToken(VAR,'xstC',1,30978) -LexToken(OPERATOR,'+',1,30982) +LexToken(ADDITION,'+',1,30982) LexToken(VAR,'modulo',1,30983) LexToken(OPENBRACKET,'(',1,30989) LexToken(VAR,'find',1,30990) @@ -6977,21 +7006,22 @@ LexToken(OPENBRACKET,'(',1,31003) LexToken(VAR,'x11',1,31004) LexToken(COMMA,',',1,31007) LexToken(VAR,'lx11',1,31008) -LexToken(OPERATOR,'-',1,31012) +LexToken(ADDITION,'-',1,31012) LexToken(VAR,'i',1,31013) -LexToken(OPERATOR,'+',1,31014) +LexToken(ADDITION,'+',1,31014) LexToken(NUMBER,'1',1,31015) LexToken(CLOSEBRACKET,')',1,31016) LexToken(CLOSEBRACKET,')',1,31017) LexToken(COMMA,',',1,31018) LexToken(NUMBER,'26',1,31019) LexToken(CLOSEBRACKET,')',1,31021) -LexToken(OPERATOR,'*',1,31022) +LexToken(MULTIPLICATION,'*',1,31022) LexToken(NUMBER,'26',1,31023) -LexToken(OPERATOR,'^',1,31025) +LexToken(MULTIPLICATION,'^',1,31025) LexToken(OPENBRACKET,'(',1,31026) LexToken(VAR,'i',1,31027) -LexToken(NUMBER,'-1',1,31028) +LexToken(ADDITION,'-',1,31028) +LexToken(NUMBER,'1',1,31029) LexToken(CLOSEBRACKET,')',1,31030) LexToken(SEMICOLON,';',1,31031) LexToken(EOL,'\n',1,31032) @@ -7013,7 +7043,7 @@ LexToken(EOL,'\n',1,31094) LexToken(VAR,'xenC',1,31111) LexToken(ASSIGNMENT,'=',1,31115) LexToken(VAR,'xenC',1,31116) -LexToken(OPERATOR,'+',1,31120) +LexToken(ADDITION,'+',1,31120) LexToken(VAR,'modulo',1,31121) LexToken(OPENBRACKET,'(',1,31127) LexToken(VAR,'find',1,31128) @@ -7025,21 +7055,22 @@ LexToken(OPENBRACKET,'(',1,31141) LexToken(VAR,'x21',1,31142) LexToken(COMMA,',',1,31145) LexToken(VAR,'lx21',1,31146) -LexToken(OPERATOR,'-',1,31150) +LexToken(ADDITION,'-',1,31150) LexToken(VAR,'i',1,31151) -LexToken(OPERATOR,'+',1,31152) +LexToken(ADDITION,'+',1,31152) LexToken(NUMBER,'1',1,31153) LexToken(CLOSEBRACKET,')',1,31154) LexToken(CLOSEBRACKET,')',1,31155) LexToken(COMMA,',',1,31156) LexToken(NUMBER,'26',1,31157) LexToken(CLOSEBRACKET,')',1,31159) -LexToken(OPERATOR,'*',1,31160) +LexToken(MULTIPLICATION,'*',1,31160) LexToken(NUMBER,'26',1,31161) -LexToken(OPERATOR,'^',1,31163) +LexToken(MULTIPLICATION,'^',1,31163) LexToken(OPENBRACKET,'(',1,31164) LexToken(VAR,'i',1,31165) -LexToken(NUMBER,'-1',1,31166) +LexToken(ADDITION,'-',1,31166) +LexToken(NUMBER,'1',1,31167) LexToken(CLOSEBRACKET,')',1,31168) LexToken(SEMICOLON,';',1,31169) LexToken(EOL,'\n',1,31170) @@ -7061,7 +7092,7 @@ LexToken(EOL,'\n',1,31232) LexToken(VAR,'ystC',1,31249) LexToken(ASSIGNMENT,'=',1,31253) LexToken(VAR,'ystC',1,31254) -LexToken(OPERATOR,'+',1,31258) +LexToken(ADDITION,'+',1,31258) LexToken(VAR,'modulo',1,31259) LexToken(OPENBRACKET,'(',1,31265) LexToken(VAR,'find',1,31266) @@ -7073,21 +7104,22 @@ LexToken(OPENBRACKET,'(',1,31279) LexToken(VAR,'y11',1,31280) LexToken(COMMA,',',1,31283) LexToken(VAR,'ly11',1,31284) -LexToken(OPERATOR,'-',1,31288) +LexToken(ADDITION,'-',1,31288) LexToken(VAR,'i',1,31289) -LexToken(OPERATOR,'+',1,31290) +LexToken(ADDITION,'+',1,31290) LexToken(NUMBER,'1',1,31291) LexToken(CLOSEBRACKET,')',1,31292) LexToken(CLOSEBRACKET,')',1,31293) LexToken(COMMA,',',1,31294) LexToken(NUMBER,'26',1,31295) LexToken(CLOSEBRACKET,')',1,31297) -LexToken(OPERATOR,'*',1,31298) +LexToken(MULTIPLICATION,'*',1,31298) LexToken(NUMBER,'26',1,31299) -LexToken(OPERATOR,'^',1,31301) +LexToken(MULTIPLICATION,'^',1,31301) LexToken(OPENBRACKET,'(',1,31302) LexToken(VAR,'i',1,31303) -LexToken(NUMBER,'-1',1,31304) +LexToken(ADDITION,'-',1,31304) +LexToken(NUMBER,'1',1,31305) LexToken(CLOSEBRACKET,')',1,31306) LexToken(SEMICOLON,';',1,31307) LexToken(EOL,'\n',1,31308) @@ -7109,7 +7141,7 @@ LexToken(EOL,'\n',1,31370) LexToken(VAR,'yenC',1,31387) LexToken(ASSIGNMENT,'=',1,31391) LexToken(VAR,'yenC',1,31392) -LexToken(OPERATOR,'+',1,31396) +LexToken(ADDITION,'+',1,31396) LexToken(VAR,'modulo',1,31397) LexToken(OPENBRACKET,'(',1,31403) LexToken(VAR,'find',1,31404) @@ -7121,21 +7153,22 @@ LexToken(OPENBRACKET,'(',1,31417) LexToken(VAR,'y21',1,31418) LexToken(COMMA,',',1,31421) LexToken(VAR,'ly21',1,31422) -LexToken(OPERATOR,'-',1,31426) +LexToken(ADDITION,'-',1,31426) LexToken(VAR,'i',1,31427) -LexToken(OPERATOR,'+',1,31428) +LexToken(ADDITION,'+',1,31428) LexToken(NUMBER,'1',1,31429) LexToken(CLOSEBRACKET,')',1,31430) LexToken(CLOSEBRACKET,')',1,31431) LexToken(COMMA,',',1,31432) LexToken(NUMBER,'26',1,31433) LexToken(CLOSEBRACKET,')',1,31435) -LexToken(OPERATOR,'*',1,31436) +LexToken(MULTIPLICATION,'*',1,31436) LexToken(NUMBER,'26',1,31437) -LexToken(OPERATOR,'^',1,31439) +LexToken(MULTIPLICATION,'^',1,31439) LexToken(OPENBRACKET,'(',1,31440) LexToken(VAR,'i',1,31441) -LexToken(NUMBER,'-1',1,31442) +LexToken(ADDITION,'-',1,31442) +LexToken(NUMBER,'1',1,31443) LexToken(CLOSEBRACKET,')',1,31444) LexToken(SEMICOLON,';',1,31445) LexToken(EOL,'\n',1,31446) @@ -7567,12 +7600,12 @@ LexToken(EOL,'\n',1,32911) LexToken(VAR,'xinfo',1,32924) LexToken(OPENBRACKET,'(',1,32929) LexToken(DQSTRING,'"x contains no data:x("',1,32952) -LexToken(OPERATOR,'+',1,32953) +LexToken(ADDITION,'+',1,32953) LexToken(VAR,'string',1,32954) LexToken(OPENBRACKET,'(',1,32960) LexToken(VAR,'i',1,32961) LexToken(CLOSEBRACKET,')',1,32962) -LexToken(OPERATOR,'+',1,32963) +LexToken(ADDITION,'+',1,32963) LexToken(DQSTRING,'")"',1,32966) LexToken(CLOSEBRACKET,')',1,32967) LexToken(SEMICOLON,';',1,32968) @@ -7599,12 +7632,12 @@ LexToken(EOL,'\n',1,33032) LexToken(VAR,'xinfo',1,33045) LexToken(OPENBRACKET,'(',1,33050) LexToken(DQSTRING,'"Y contains no data:y("',1,33073) -LexToken(OPERATOR,'+',1,33074) +LexToken(ADDITION,'+',1,33074) LexToken(VAR,'string',1,33075) LexToken(OPENBRACKET,'(',1,33081) LexToken(VAR,'i',1,33082) LexToken(CLOSEBRACKET,')',1,33083) -LexToken(OPERATOR,'+',1,33084) +LexToken(ADDITION,'+',1,33084) LexToken(DQSTRING,'")"',1,33087) LexToken(CLOSEBRACKET,')',1,33088) LexToken(SEMICOLON,';',1,33089) @@ -8033,7 +8066,8 @@ LexToken(VAR,'Lx',1,34821) LexToken(ASSIGNMENT,'=',1,34823) LexToken(VAR,'mfscanf',1,34824) LexToken(OPENBRACKET,'(',1,34831) -LexToken(NUMBER,'-1',1,34832) +LexToken(ADDITION,'-',1,34832) +LexToken(NUMBER,'1',1,34833) LexToken(COMMA,',',1,34834) LexToken(VAR,'fd',1,34835) LexToken(COMMA,',',1,34837) @@ -8052,7 +8086,7 @@ LexToken(EOL,'\n',1,34885) LexToken(VAR,'xinfo',1,34898) LexToken(OPENBRACKET,'(',1,34903) LexToken(DQSTRING,'"Scicos cannot open the data file:"',1,34938) -LexToken(OPERATOR,'+',1,34939) +LexToken(ADDITION,'+',1,34939) LexToken(VAR,'filen',1,34940) LexToken(CLOSEBRACKET,')',1,34945) LexToken(SEMICOLON,';',1,34946) @@ -8319,7 +8353,7 @@ LexToken(EOL,'\n',1,35911) LexToken(VAR,'Cformat',1,35920) LexToken(ASSIGNMENT,'=',1,35927) LexToken(VAR,'Cformat',1,35928) -LexToken(OPERATOR,'+',1,35935) +LexToken(ADDITION,'+',1,35935) LexToken(DQSTRING,'"\\n"',1,35939) LexToken(SEMICOLON,';',1,35940) LexToken(EOL,'\n',1,35941) @@ -8359,7 +8393,7 @@ LexToken(EOL,'\n',1,36065) LexToken(VAR,'xinfo',1,36078) LexToken(OPENBRACKET,'(',1,36083) LexToken(DQSTRING,'"Scicos cannot open the data file:"',1,36118) -LexToken(OPERATOR,'+',1,36119) +LexToken(ADDITION,'+',1,36119) LexToken(VAR,'filen',1,36120) LexToken(CLOSEBRACKET,')',1,36125) LexToken(SEMICOLON,';',1,36126) @@ -8478,7 +8512,8 @@ LexToken(ASSIGNMENT,'=',1,36495) LexToken(NUMBER,'1',1,36496) LexToken(COLON,':',1,36497) LexToken(VAR,'N',1,36498) -LexToken(NUMBER,'-1',1,36499) +LexToken(ADDITION,'-',1,36499) +LexToken(NUMBER,'1',1,36500) LexToken(EOL,'\n',1,36501) LexToken(VAR,'X',1,36514) LexToken(ASSIGNMENT,'=',1,36515) @@ -8488,14 +8523,14 @@ LexToken(SEMICOLON,';',1,36518) LexToken(VAR,'x',1,36519) LexToken(OPENBRACKET,'(',1,36520) LexToken(VAR,'i',1,36521) -LexToken(OPERATOR,'+',1,36522) +LexToken(ADDITION,'+',1,36522) LexToken(NUMBER,'1',1,36523) LexToken(CLOSEBRACKET,')',1,36524) LexToken(SEMICOLON,';',1,36525) LexToken(VAR,'x',1,36526) LexToken(OPENBRACKET,'(',1,36527) LexToken(VAR,'i',1,36528) -LexToken(OPERATOR,'+',1,36529) +LexToken(ADDITION,'+',1,36529) LexToken(NUMBER,'1',1,36530) LexToken(CLOSEBRACKET,')',1,36531) LexToken(CLOSESQBRACKET,']',1,36532) @@ -8514,7 +8549,7 @@ LexToken(SEMICOLON,';',1,36556) LexToken(VAR,'y',1,36557) LexToken(OPENBRACKET,'(',1,36558) LexToken(VAR,'i',1,36559) -LexToken(OPERATOR,'+',1,36560) +LexToken(ADDITION,'+',1,36560) LexToken(NUMBER,'1',1,36561) LexToken(CLOSEBRACKET,')',1,36562) LexToken(CLOSESQBRACKET,']',1,36563) @@ -8588,7 +8623,8 @@ LexToken(ASSIGNMENT,'=',1,36739) LexToken(NUMBER,'1',1,36740) LexToken(COLON,':',1,36741) LexToken(VAR,'N',1,36742) -LexToken(NUMBER,'-1',1,36743) +LexToken(ADDITION,'-',1,36743) +LexToken(NUMBER,'1',1,36744) LexToken(EOL,'\n',1,36745) LexToken(VAR,'X',1,36758) LexToken(ASSIGNMENT,'=',1,36759) @@ -8603,7 +8639,7 @@ LexToken(SEMICOLON,';',1,36767) LexToken(VAR,'x',1,36768) LexToken(OPENBRACKET,'(',1,36769) LexToken(VAR,'i',1,36770) -LexToken(OPERATOR,'+',1,36771) +LexToken(ADDITION,'+',1,36771) LexToken(NUMBER,'1',1,36772) LexToken(CLOSEBRACKET,')',1,36773) LexToken(CLOSESQBRACKET,']',1,36774) @@ -8617,14 +8653,14 @@ LexToken(SEMICOLON,';',1,36793) LexToken(VAR,'y',1,36794) LexToken(OPENBRACKET,'(',1,36795) LexToken(VAR,'i',1,36796) -LexToken(OPERATOR,'+',1,36797) +LexToken(ADDITION,'+',1,36797) LexToken(NUMBER,'1',1,36798) LexToken(CLOSEBRACKET,')',1,36799) LexToken(SEMICOLON,';',1,36800) LexToken(VAR,'y',1,36801) LexToken(OPENBRACKET,'(',1,36802) LexToken(VAR,'i',1,36803) -LexToken(OPERATOR,'+',1,36804) +LexToken(ADDITION,'+',1,36804) LexToken(NUMBER,'1',1,36805) LexToken(CLOSEBRACKET,')',1,36806) LexToken(CLOSESQBRACKET,']',1,36807) @@ -8698,7 +8734,8 @@ LexToken(ASSIGNMENT,'=',1,36985) LexToken(NUMBER,'1',1,36986) LexToken(COLON,':',1,36987) LexToken(VAR,'N',1,36988) -LexToken(NUMBER,'-1',1,36989) +LexToken(ADDITION,'-',1,36989) +LexToken(NUMBER,'1',1,36990) LexToken(EOL,'\n',1,36991) LexToken(VAR,'X',1,37004) LexToken(ASSIGNMENT,'=',1,37005) @@ -8710,15 +8747,15 @@ LexToken(VAR,'x',1,37010) LexToken(OPENBRACKET,'(',1,37011) LexToken(VAR,'i',1,37012) LexToken(CLOSEBRACKET,')',1,37013) -LexToken(OPERATOR,'+',1,37014) +LexToken(ADDITION,'+',1,37014) LexToken(VAR,'x',1,37015) LexToken(OPENBRACKET,'(',1,37016) LexToken(VAR,'i',1,37017) -LexToken(OPERATOR,'+',1,37018) +LexToken(ADDITION,'+',1,37018) LexToken(NUMBER,'1',1,37019) LexToken(CLOSEBRACKET,')',1,37020) LexToken(CLOSEBRACKET,')',1,37021) -LexToken(OPERATOR,'/',1,37022) +LexToken(MULTIPLICATION,'/',1,37022) LexToken(NUMBER,'2',1,37023) LexToken(SEMICOLON,';',1,37024) LexToken(OPENBRACKET,'(',1,37025) @@ -8726,15 +8763,15 @@ LexToken(VAR,'x',1,37026) LexToken(OPENBRACKET,'(',1,37027) LexToken(VAR,'i',1,37028) LexToken(CLOSEBRACKET,')',1,37029) -LexToken(OPERATOR,'+',1,37030) +LexToken(ADDITION,'+',1,37030) LexToken(VAR,'x',1,37031) LexToken(OPENBRACKET,'(',1,37032) LexToken(VAR,'i',1,37033) -LexToken(OPERATOR,'+',1,37034) +LexToken(ADDITION,'+',1,37034) LexToken(NUMBER,'1',1,37035) LexToken(CLOSEBRACKET,')',1,37036) LexToken(CLOSEBRACKET,')',1,37037) -LexToken(OPERATOR,'/',1,37038) +LexToken(MULTIPLICATION,'/',1,37038) LexToken(NUMBER,'2',1,37039) LexToken(CLOSESQBRACKET,']',1,37040) LexToken(SEMICOLON,';',1,37041) @@ -8752,7 +8789,7 @@ LexToken(SEMICOLON,';',1,37064) LexToken(VAR,'y',1,37065) LexToken(OPENBRACKET,'(',1,37066) LexToken(VAR,'i',1,37067) -LexToken(OPERATOR,'+',1,37068) +LexToken(ADDITION,'+',1,37068) LexToken(NUMBER,'1',1,37069) LexToken(CLOSEBRACKET,')',1,37070) LexToken(CLOSESQBRACKET,']',1,37071) @@ -8850,34 +8887,34 @@ LexToken(VAR,'y',1,37424) LexToken(OPENBRACKET,'(',1,37425) LexToken(NUMBER,'1',1,37426) LexToken(CLOSEBRACKET,')',1,37427) -LexToken(OPERATOR,'+',1,37428) +LexToken(ADDITION,'+',1,37428) LexToken(OPENBRACKET,'(',1,37429) LexToken(VAR,'xmn',1,37430) -LexToken(OPERATOR,'-',1,37433) +LexToken(ADDITION,'-',1,37433) LexToken(VAR,'x',1,37434) LexToken(OPENBRACKET,'(',1,37435) LexToken(NUMBER,'1',1,37436) LexToken(CLOSEBRACKET,')',1,37437) LexToken(CLOSEBRACKET,')',1,37438) -LexToken(OPERATOR,'*',1,37439) +LexToken(MULTIPLICATION,'*',1,37439) LexToken(OPENBRACKET,'(',1,37440) LexToken(VAR,'y',1,37441) LexToken(OPENBRACKET,'(',1,37442) LexToken(NUMBER,'1',1,37443) LexToken(CLOSEBRACKET,')',1,37444) -LexToken(OPERATOR,'-',1,37445) +LexToken(ADDITION,'-',1,37445) LexToken(VAR,'y',1,37446) LexToken(OPENBRACKET,'(',1,37447) LexToken(NUMBER,'2',1,37448) LexToken(CLOSEBRACKET,')',1,37449) LexToken(CLOSEBRACKET,')',1,37450) -LexToken(OPERATOR,'/',1,37451) +LexToken(MULTIPLICATION,'/',1,37451) LexToken(OPENBRACKET,'(',1,37452) LexToken(VAR,'x',1,37453) LexToken(OPENBRACKET,'(',1,37454) LexToken(NUMBER,'1',1,37455) LexToken(CLOSEBRACKET,')',1,37456) -LexToken(OPERATOR,'-',1,37457) +LexToken(ADDITION,'-',1,37457) LexToken(VAR,'x',1,37458) LexToken(OPENBRACKET,'(',1,37459) LexToken(NUMBER,'2',1,37460) @@ -8973,39 +9010,41 @@ LexToken(VAR,'y',1,37708) LexToken(OPENBRACKET,'(',1,37709) LexToken(VAR,'N',1,37710) LexToken(CLOSEBRACKET,')',1,37711) -LexToken(OPERATOR,'+',1,37712) +LexToken(ADDITION,'+',1,37712) LexToken(OPENBRACKET,'(',1,37713) LexToken(VAR,'xmx',1,37714) -LexToken(OPERATOR,'-',1,37717) +LexToken(ADDITION,'-',1,37717) LexToken(VAR,'x',1,37718) LexToken(OPENBRACKET,'(',1,37719) LexToken(VAR,'N',1,37720) LexToken(CLOSEBRACKET,')',1,37721) LexToken(CLOSEBRACKET,')',1,37722) -LexToken(OPERATOR,'*',1,37723) +LexToken(MULTIPLICATION,'*',1,37723) LexToken(OPENBRACKET,'(',1,37724) LexToken(VAR,'y',1,37725) LexToken(OPENBRACKET,'(',1,37726) LexToken(VAR,'N',1,37727) LexToken(CLOSEBRACKET,')',1,37728) -LexToken(OPERATOR,'-',1,37729) +LexToken(ADDITION,'-',1,37729) LexToken(VAR,'y',1,37730) LexToken(OPENBRACKET,'(',1,37731) LexToken(VAR,'N',1,37732) -LexToken(NUMBER,'-1',1,37733) +LexToken(ADDITION,'-',1,37733) +LexToken(NUMBER,'1',1,37734) LexToken(CLOSEBRACKET,')',1,37735) LexToken(CLOSEBRACKET,')',1,37736) -LexToken(OPERATOR,'/',1,37737) +LexToken(MULTIPLICATION,'/',1,37737) LexToken(OPENBRACKET,'(',1,37738) LexToken(VAR,'x',1,37739) LexToken(OPENBRACKET,'(',1,37740) LexToken(VAR,'N',1,37741) LexToken(CLOSEBRACKET,')',1,37742) -LexToken(OPERATOR,'-',1,37743) +LexToken(ADDITION,'-',1,37743) LexToken(VAR,'x',1,37744) LexToken(OPENBRACKET,'(',1,37745) LexToken(VAR,'N',1,37746) -LexToken(NUMBER,'-1',1,37747) +LexToken(ADDITION,'-',1,37747) +LexToken(NUMBER,'1',1,37748) LexToken(CLOSEBRACKET,')',1,37749) LexToken(CLOSEBRACKET,')',1,37750) LexToken(CLOSESQBRACKET,']',1,37751) @@ -9085,7 +9124,8 @@ LexToken(ASSIGNMENT,'=',1,38027) LexToken(NUMBER,'1',1,38028) LexToken(COLON,':',1,38029) LexToken(VAR,'N',1,38030) -LexToken(NUMBER,'-1',1,38031) +LexToken(ADDITION,'-',1,38031) +LexToken(NUMBER,'1',1,38032) LexToken(EOL,'\n',1,38033) LexToken(VAR,'X',1,38042) LexToken(ASSIGNMENT,'=',1,38043) @@ -9102,12 +9142,12 @@ LexToken(COMMA,',',1,38060) LexToken(VAR,'x',1,38061) LexToken(OPENBRACKET,'(',1,38062) LexToken(VAR,'i',1,38063) -LexToken(OPERATOR,'+',1,38064) +LexToken(ADDITION,'+',1,38064) LexToken(NUMBER,'1',1,38065) LexToken(CLOSEBRACKET,')',1,38066) LexToken(COMMA,',',1,38067) LexToken(VAR,'NP',1,38068) -LexToken(OPERATOR,'+',1,38070) +LexToken(ADDITION,'+',1,38070) LexToken(NUMBER,'2',1,38071) LexToken(CLOSEBRACKET,')',1,38072) LexToken(TRANSPOSE,"'",1,38073) @@ -9135,7 +9175,7 @@ LexToken(NUMBER,'1',1,38177) LexToken(CLOSEBRACKET,')',1,38178) LexToken(COMMA,',',1,38179) LexToken(VAR,'NP',1,38180) -LexToken(OPERATOR,'+',1,38182) +LexToken(ADDITION,'+',1,38182) LexToken(NUMBER,'2',1,38183) LexToken(CLOSEBRACKET,')',1,38184) LexToken(TRANSPOSE,"'",1,38185) @@ -9152,7 +9192,7 @@ LexToken(COMMA,',',1,38202) LexToken(VAR,'xmx',1,38203) LexToken(COMMA,',',1,38206) LexToken(VAR,'NP',1,38207) -LexToken(OPERATOR,'+',1,38209) +LexToken(ADDITION,'+',1,38209) LexToken(NUMBER,'2',1,38210) LexToken(CLOSEBRACKET,')',1,38211) LexToken(TRANSPOSE,"'",1,38212) @@ -9193,7 +9233,8 @@ LexToken(OPENBRACKET,'(',1,38347) LexToken(NUMBER,'1',1,38348) LexToken(COLON,':',1,38349) LexToken(VAR,'N',1,38350) -LexToken(NUMBER,'-1',1,38351) +LexToken(ADDITION,'-',1,38351) +LexToken(NUMBER,'1',1,38352) LexToken(CLOSEBRACKET,')',1,38353) LexToken(SEMICOLON,';',1,38354) LexToken(EOL,'\n',1,38355) @@ -9204,9 +9245,10 @@ LexToken(OPENBRACKET,'(',1,38367) LexToken(VAR,'N',1,38368) LexToken(COLON,':',1,38369) LexToken(NUMBER,'2',1,38370) -LexToken(OPERATOR,'*',1,38371) +LexToken(MULTIPLICATION,'*',1,38371) LexToken(VAR,'N',1,38372) -LexToken(NUMBER,'-2',1,38373) +LexToken(ADDITION,'-',1,38373) +LexToken(NUMBER,'2',1,38374) LexToken(CLOSEBRACKET,')',1,38375) LexToken(SEMICOLON,';',1,38376) LexToken(EOL,'\n',1,38377) @@ -9215,14 +9257,16 @@ LexToken(ASSIGNMENT,'=',1,38387) LexToken(VAR,'Z',1,38388) LexToken(OPENBRACKET,'(',1,38389) LexToken(NUMBER,'2',1,38390) -LexToken(OPERATOR,'*',1,38391) +LexToken(MULTIPLICATION,'*',1,38391) LexToken(VAR,'N',1,38392) -LexToken(NUMBER,'-1',1,38393) +LexToken(ADDITION,'-',1,38393) +LexToken(NUMBER,'1',1,38394) LexToken(COLON,':',1,38395) LexToken(NUMBER,'3',1,38396) -LexToken(OPERATOR,'*',1,38397) +LexToken(MULTIPLICATION,'*',1,38397) LexToken(VAR,'N',1,38398) -LexToken(NUMBER,'-3',1,38399) +LexToken(ADDITION,'-',1,38399) +LexToken(NUMBER,'3',1,38400) LexToken(CLOSEBRACKET,')',1,38401) LexToken(SEMICOLON,';',1,38402) LexToken(EOL,'\n',1,38403) @@ -9242,9 +9286,11 @@ LexToken(FOR,'for',1,38444) LexToken(VAR,'i',1,38448) LexToken(ASSIGNMENT,'=',1,38449) LexToken(VAR,'N',1,38450) -LexToken(NUMBER,'-1',1,38451) +LexToken(ADDITION,'-',1,38451) +LexToken(NUMBER,'1',1,38452) LexToken(COLON,':',1,38453) -LexToken(NUMBER,'-1',1,38454) +LexToken(ADDITION,'-',1,38454) +LexToken(NUMBER,'1',1,38455) LexToken(COLON,':',1,38456) LexToken(NUMBER,'1',1,38457) LexToken(EOL,'\n',1,38458) @@ -9277,38 +9323,38 @@ LexToken(VAR,'A',1,38575) LexToken(OPENBRACKET,'(',1,38576) LexToken(VAR,'i',1,38577) LexToken(CLOSEBRACKET,')',1,38578) -LexToken(OPERATOR,'*',1,38579) +LexToken(MULTIPLICATION,'*',1,38579) LexToken(OPENBRACKET,'(',1,38580) LexToken(VAR,'X',1,38581) LexToken(OPENBRACKET,'(',1,38582) LexToken(VAR,'j',1,38583) LexToken(CLOSEBRACKET,')',1,38584) -LexToken(OPERATOR,'-',1,38585) +LexToken(ADDITION,'-',1,38585) LexToken(VAR,'x',1,38586) LexToken(OPENBRACKET,'(',1,38587) LexToken(VAR,'i',1,38588) LexToken(CLOSEBRACKET,')',1,38589) LexToken(CLOSEBRACKET,')',1,38590) -LexToken(OPERATOR,'^',1,38591) +LexToken(MULTIPLICATION,'^',1,38591) LexToken(NUMBER,'2',1,38592) -LexToken(OPERATOR,'+',1,38593) +LexToken(ADDITION,'+',1,38593) LexToken(VAR,'B',1,38594) LexToken(OPENBRACKET,'(',1,38595) LexToken(VAR,'i',1,38596) LexToken(CLOSEBRACKET,')',1,38597) -LexToken(OPERATOR,'*',1,38598) +LexToken(MULTIPLICATION,'*',1,38598) LexToken(OPENBRACKET,'(',1,38599) LexToken(VAR,'X',1,38600) LexToken(OPENBRACKET,'(',1,38601) LexToken(VAR,'j',1,38602) LexToken(CLOSEBRACKET,')',1,38603) -LexToken(OPERATOR,'-',1,38604) +LexToken(ADDITION,'-',1,38604) LexToken(VAR,'x',1,38605) LexToken(OPENBRACKET,'(',1,38606) LexToken(VAR,'i',1,38607) LexToken(CLOSEBRACKET,')',1,38608) LexToken(CLOSEBRACKET,')',1,38609) -LexToken(OPERATOR,'+',1,38610) +LexToken(ADDITION,'+',1,38610) LexToken(VAR,'C',1,38611) LexToken(OPENBRACKET,'(',1,38612) LexToken(VAR,'i',1,38613) @@ -9323,7 +9369,8 @@ LexToken(VAR,'matrix',1,38643) LexToken(OPENBRACKET,'(',1,38649) LexToken(VAR,'Z',1,38650) LexToken(COMMA,',',1,38651) -LexToken(NUMBER,'-1',1,38652) +LexToken(ADDITION,'-',1,38652) +LexToken(NUMBER,'1',1,38653) LexToken(COMMA,',',1,38654) LexToken(NUMBER,'1',1,38655) LexToken(CLOSEBRACKET,')',1,38656) @@ -9380,7 +9427,7 @@ LexToken(EOL,'\n',1,38870) LexToken(VAR,'xinfo',1,38883) LexToken(OPENBRACKET,'(',1,38888) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38907) -LexToken(OPERATOR,'+',1,38908) +LexToken(ADDITION,'+',1,38908) LexToken(VAR,'METHOD',1,38909) LexToken(CLOSEBRACKET,')',1,38915) LexToken(EOL,'\n',1,38916) @@ -9463,7 +9510,7 @@ LexToken(EOL,'\n',1,39200) LexToken(VAR,'xinfo',1,39213) LexToken(OPENBRACKET,'(',1,39218) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,39237) -LexToken(OPERATOR,'+',1,39238) +LexToken(ADDITION,'+',1,39238) LexToken(VAR,'METHOD',1,39239) LexToken(CLOSEBRACKET,')',1,39245) LexToken(EOL,'\n',1,39246) @@ -9521,7 +9568,7 @@ LexToken(EOL,'\n',1,39470) LexToken(VAR,'xinfo',1,39483) LexToken(OPENBRACKET,'(',1,39488) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,39507) -LexToken(OPERATOR,'+',1,39508) +LexToken(ADDITION,'+',1,39508) LexToken(VAR,'METHOD',1,39509) LexToken(CLOSEBRACKET,')',1,39515) LexToken(EOL,'\n',1,39516) @@ -9580,7 +9627,7 @@ LexToken(EOL,'\n',1,39736) LexToken(VAR,'xinfo',1,39749) LexToken(OPENBRACKET,'(',1,39754) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,39774) -LexToken(OPERATOR,'+',1,39775) +LexToken(ADDITION,'+',1,39775) LexToken(VAR,'METHOD',1,39776) LexToken(CLOSEBRACKET,')',1,39782) LexToken(EOL,'\n',1,39783) @@ -9644,7 +9691,7 @@ LexToken(EOL,'\n',1,40011) LexToken(VAR,'xinfo',1,40024) LexToken(OPENBRACKET,'(',1,40029) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,40048) -LexToken(OPERATOR,'+',1,40049) +LexToken(ADDITION,'+',1,40049) LexToken(VAR,'METHOD',1,40050) LexToken(CLOSEBRACKET,')',1,40056) LexToken(EOL,'\n',1,40057) @@ -9705,7 +9752,8 @@ LexToken(VAR,'x',1,40249) LexToken(COMMA,',',1,40250) LexToken(DQSTRING,'"*"',1,40253) LexToken(CLOSEBRACKET,')',1,40254) -LexToken(NUMBER,'-1',1,40255) +LexToken(ADDITION,'-',1,40255) +LexToken(NUMBER,'1',1,40256) LexToken(SEMICOLON,';',1,40257) LexToken(EOL,'\n',1,40258) LexToken(VAR,'A',1,40263) @@ -9713,12 +9761,13 @@ LexToken(ASSIGNMENT,'=',1,40264) LexToken(VAR,'zeros',1,40265) LexToken(OPENBRACKET,'(',1,40270) LexToken(NUMBER,'3',1,40271) -LexToken(OPERATOR,'*',1,40272) +LexToken(MULTIPLICATION,'*',1,40272) LexToken(VAR,'N',1,40273) -LexToken(NUMBER,'-1',1,40274) +LexToken(ADDITION,'-',1,40274) +LexToken(NUMBER,'1',1,40275) LexToken(COMMA,',',1,40276) LexToken(VAR,'N',1,40277) -LexToken(OPERATOR,'*',1,40278) +LexToken(MULTIPLICATION,'*',1,40278) LexToken(NUMBER,'3',1,40279) LexToken(CLOSEBRACKET,')',1,40280) LexToken(SEMICOLON,';',1,40281) @@ -9728,9 +9777,10 @@ LexToken(ASSIGNMENT,'=',1,40288) LexToken(VAR,'zeros',1,40289) LexToken(OPENBRACKET,'(',1,40294) LexToken(NUMBER,'3',1,40295) -LexToken(OPERATOR,'*',1,40296) +LexToken(MULTIPLICATION,'*',1,40296) LexToken(VAR,'N',1,40297) -LexToken(NUMBER,'-1',1,40298) +LexToken(ADDITION,'-',1,40298) +LexToken(NUMBER,'1',1,40299) LexToken(COMMA,',',1,40300) LexToken(NUMBER,'1',1,40301) LexToken(CLOSEBRACKET,')',1,40302) @@ -9746,12 +9796,13 @@ LexToken(EOL,'\n',1,40318) LexToken(VAR,'j',1,40327) LexToken(ASSIGNMENT,'=',1,40328) LexToken(NUMBER,'3',1,40329) -LexToken(OPERATOR,'*',1,40330) +LexToken(MULTIPLICATION,'*',1,40330) LexToken(OPENBRACKET,'(',1,40331) LexToken(VAR,'i',1,40332) -LexToken(NUMBER,'-1',1,40333) +LexToken(ADDITION,'-',1,40333) +LexToken(NUMBER,'1',1,40334) LexToken(CLOSEBRACKET,')',1,40335) -LexToken(OPERATOR,'+',1,40336) +LexToken(ADDITION,'+',1,40336) LexToken(NUMBER,'1',1,40337) LexToken(SEMICOLON,';',1,40338) LexToken(EOL,'\n',1,40339) @@ -9760,9 +9811,9 @@ LexToken(OPENBRACKET,'(',1,40349) LexToken(VAR,'j',1,40350) LexToken(COMMA,',',1,40351) LexToken(VAR,'i',1,40352) -LexToken(OPERATOR,'+',1,40353) +LexToken(ADDITION,'+',1,40353) LexToken(NUMBER,'2',1,40354) -LexToken(OPERATOR,'*',1,40355) +LexToken(MULTIPLICATION,'*',1,40355) LexToken(VAR,'N',1,40356) LexToken(CLOSEBRACKET,')',1,40357) LexToken(ASSIGNMENT,'=',1,40358) @@ -9783,7 +9834,7 @@ LexToken(EOL,'\n',1,40380) LexToken(VAR,'A',1,40389) LexToken(OPENBRACKET,'(',1,40390) LexToken(VAR,'j',1,40391) -LexToken(OPERATOR,'+',1,40392) +LexToken(ADDITION,'+',1,40392) LexToken(NUMBER,'1',1,40393) LexToken(COMMA,',',1,40394) LexToken(VAR,'i',1,40395) @@ -9793,37 +9844,37 @@ LexToken(OPENBRACKET,'(',1,40398) LexToken(VAR,'x',1,40399) LexToken(OPENBRACKET,'(',1,40400) LexToken(VAR,'i',1,40401) -LexToken(OPERATOR,'+',1,40402) +LexToken(ADDITION,'+',1,40402) LexToken(NUMBER,'1',1,40403) LexToken(CLOSEBRACKET,')',1,40404) -LexToken(OPERATOR,'-',1,40405) +LexToken(ADDITION,'-',1,40405) LexToken(VAR,'x',1,40406) LexToken(OPENBRACKET,'(',1,40407) LexToken(VAR,'i',1,40408) LexToken(CLOSEBRACKET,')',1,40409) LexToken(CLOSEBRACKET,')',1,40410) -LexToken(OPERATOR,'^',1,40411) +LexToken(MULTIPLICATION,'^',1,40411) LexToken(NUMBER,'2',1,40412) LexToken(SEMICOLON,';',1,40413) LexToken(EOL,'\n',1,40414) LexToken(VAR,'A',1,40423) LexToken(OPENBRACKET,'(',1,40424) LexToken(VAR,'j',1,40425) -LexToken(OPERATOR,'+',1,40426) +LexToken(ADDITION,'+',1,40426) LexToken(NUMBER,'1',1,40427) LexToken(COMMA,',',1,40428) LexToken(VAR,'i',1,40429) -LexToken(OPERATOR,'+',1,40430) +LexToken(ADDITION,'+',1,40430) LexToken(VAR,'N',1,40431) LexToken(CLOSEBRACKET,')',1,40432) LexToken(ASSIGNMENT,'=',1,40433) LexToken(VAR,'x',1,40434) LexToken(OPENBRACKET,'(',1,40435) LexToken(VAR,'i',1,40436) -LexToken(OPERATOR,'+',1,40437) +LexToken(ADDITION,'+',1,40437) LexToken(NUMBER,'1',1,40438) LexToken(CLOSEBRACKET,')',1,40439) -LexToken(OPERATOR,'-',1,40440) +LexToken(ADDITION,'-',1,40440) LexToken(VAR,'x',1,40441) LexToken(OPENBRACKET,'(',1,40442) LexToken(VAR,'i',1,40443) @@ -9833,13 +9884,13 @@ LexToken(EOL,'\n',1,40446) LexToken(VAR,'A',1,40455) LexToken(OPENBRACKET,'(',1,40456) LexToken(VAR,'j',1,40457) -LexToken(OPERATOR,'+',1,40458) +LexToken(ADDITION,'+',1,40458) LexToken(NUMBER,'1',1,40459) LexToken(COMMA,',',1,40460) LexToken(VAR,'i',1,40461) -LexToken(OPERATOR,'+',1,40462) +LexToken(ADDITION,'+',1,40462) LexToken(NUMBER,'2',1,40463) -LexToken(OPERATOR,'*',1,40464) +LexToken(MULTIPLICATION,'*',1,40464) LexToken(VAR,'N',1,40465) LexToken(CLOSEBRACKET,')',1,40466) LexToken(ASSIGNMENT,'=',1,40467) @@ -9849,14 +9900,14 @@ LexToken(EOL,'\n',1,40470) LexToken(VAR,'B',1,40479) LexToken(OPENBRACKET,'(',1,40480) LexToken(VAR,'j',1,40481) -LexToken(OPERATOR,'+',1,40482) +LexToken(ADDITION,'+',1,40482) LexToken(NUMBER,'1',1,40483) LexToken(CLOSEBRACKET,')',1,40484) LexToken(ASSIGNMENT,'=',1,40485) LexToken(VAR,'y',1,40486) LexToken(OPENBRACKET,'(',1,40487) LexToken(VAR,'i',1,40488) -LexToken(OPERATOR,'+',1,40489) +LexToken(ADDITION,'+',1,40489) LexToken(NUMBER,'1',1,40490) LexToken(CLOSEBRACKET,')',1,40491) LexToken(SEMICOLON,';',1,40492) @@ -9870,39 +9921,41 @@ LexToken(ASSIGNMENT,'=',1,40512) LexToken(NUMBER,'1',1,40513) LexToken(COLON,':',1,40514) LexToken(VAR,'N',1,40515) -LexToken(NUMBER,'-1',1,40516) +LexToken(ADDITION,'-',1,40516) +LexToken(NUMBER,'1',1,40517) LexToken(EOL,'\n',1,40518) LexToken(VAR,'j',1,40527) LexToken(ASSIGNMENT,'=',1,40528) LexToken(NUMBER,'3',1,40529) -LexToken(OPERATOR,'*',1,40530) +LexToken(MULTIPLICATION,'*',1,40530) LexToken(OPENBRACKET,'(',1,40531) LexToken(VAR,'i',1,40532) -LexToken(NUMBER,'-1',1,40533) +LexToken(ADDITION,'-',1,40533) +LexToken(NUMBER,'1',1,40534) LexToken(CLOSEBRACKET,')',1,40535) -LexToken(OPERATOR,'+',1,40536) +LexToken(ADDITION,'+',1,40536) LexToken(NUMBER,'1',1,40537) LexToken(SEMICOLON,';',1,40538) LexToken(EOL,'\n',1,40539) LexToken(VAR,'A',1,40548) LexToken(OPENBRACKET,'(',1,40549) LexToken(VAR,'j',1,40550) -LexToken(OPERATOR,'+',1,40551) +LexToken(ADDITION,'+',1,40551) LexToken(NUMBER,'2',1,40552) LexToken(COMMA,',',1,40553) LexToken(VAR,'i',1,40554) LexToken(CLOSEBRACKET,')',1,40555) LexToken(ASSIGNMENT,'=',1,40556) LexToken(NUMBER,'2',1,40557) -LexToken(OPERATOR,'*',1,40558) +LexToken(MULTIPLICATION,'*',1,40558) LexToken(OPENBRACKET,'(',1,40559) LexToken(VAR,'x',1,40560) LexToken(OPENBRACKET,'(',1,40561) LexToken(VAR,'i',1,40562) -LexToken(OPERATOR,'+',1,40563) +LexToken(ADDITION,'+',1,40563) LexToken(NUMBER,'1',1,40564) LexToken(CLOSEBRACKET,')',1,40565) -LexToken(OPERATOR,'-',1,40566) +LexToken(ADDITION,'-',1,40566) LexToken(VAR,'x',1,40567) LexToken(OPENBRACKET,'(',1,40568) LexToken(VAR,'i',1,40569) @@ -9913,11 +9966,11 @@ LexToken(EOL,'\n',1,40573) LexToken(VAR,'A',1,40582) LexToken(OPENBRACKET,'(',1,40583) LexToken(VAR,'j',1,40584) -LexToken(OPERATOR,'+',1,40585) +LexToken(ADDITION,'+',1,40585) LexToken(NUMBER,'2',1,40586) LexToken(COMMA,',',1,40587) LexToken(VAR,'i',1,40588) -LexToken(OPERATOR,'+',1,40589) +LexToken(ADDITION,'+',1,40589) LexToken(VAR,'N',1,40590) LexToken(CLOSEBRACKET,')',1,40591) LexToken(ASSIGNMENT,'=',1,40592) @@ -9927,17 +9980,18 @@ LexToken(EOL,'\n',1,40595) LexToken(VAR,'A',1,40604) LexToken(OPENBRACKET,'(',1,40605) LexToken(VAR,'j',1,40606) -LexToken(OPERATOR,'+',1,40607) +LexToken(ADDITION,'+',1,40607) LexToken(NUMBER,'2',1,40608) LexToken(COMMA,',',1,40609) LexToken(VAR,'i',1,40610) -LexToken(OPERATOR,'+',1,40611) +LexToken(ADDITION,'+',1,40611) LexToken(VAR,'N',1,40612) -LexToken(OPERATOR,'+',1,40613) +LexToken(ADDITION,'+',1,40613) LexToken(NUMBER,'1',1,40614) LexToken(CLOSEBRACKET,')',1,40615) LexToken(ASSIGNMENT,'=',1,40616) -LexToken(NUMBER,'-1',1,40617) +LexToken(ADDITION,'-',1,40617) +LexToken(NUMBER,'1',1,40618) LexToken(SEMICOLON,';',1,40619) LexToken(EOL,'\n',1,40620) LexToken(END,'end',1,40625) @@ -9948,11 +10002,11 @@ LexToken(ASSIGNMENT,'=',1,40635) LexToken(VAR,'zeros',1,40636) LexToken(OPENBRACKET,'(',1,40641) LexToken(NUMBER,'3',1,40642) -LexToken(OPERATOR,'*',1,40643) +LexToken(MULTIPLICATION,'*',1,40643) LexToken(VAR,'N',1,40644) LexToken(COMMA,',',1,40645) LexToken(NUMBER,'3',1,40646) -LexToken(OPERATOR,'*',1,40647) +LexToken(MULTIPLICATION,'*',1,40647) LexToken(VAR,'N',1,40648) LexToken(CLOSEBRACKET,')',1,40649) LexToken(SEMICOLON,';',1,40650) @@ -9972,21 +10026,21 @@ LexToken(VAR,'i',1,40678) LexToken(CLOSEBRACKET,')',1,40679) LexToken(ASSIGNMENT,'=',1,40680) LexToken(NUMBER,'4',1,40681) -LexToken(OPERATOR,'*',1,40682) +LexToken(MULTIPLICATION,'*',1,40682) LexToken(OPENBRACKET,'(',1,40683) LexToken(VAR,'x',1,40684) LexToken(OPENBRACKET,'(',1,40685) LexToken(VAR,'i',1,40686) -LexToken(OPERATOR,'+',1,40687) +LexToken(ADDITION,'+',1,40687) LexToken(NUMBER,'1',1,40688) LexToken(CLOSEBRACKET,')',1,40689) -LexToken(OPERATOR,'-',1,40690) +LexToken(ADDITION,'-',1,40690) LexToken(VAR,'x',1,40691) LexToken(OPENBRACKET,'(',1,40692) LexToken(VAR,'i',1,40693) LexToken(CLOSEBRACKET,')',1,40694) LexToken(CLOSEBRACKET,')',1,40695) -LexToken(OPERATOR,'^',1,40696) +LexToken(MULTIPLICATION,'^',1,40696) LexToken(NUMBER,'2',1,40697) LexToken(EOL,'\n',1,40698) LexToken(VAR,'Q',1,40707) @@ -9994,20 +10048,20 @@ LexToken(OPENBRACKET,'(',1,40708) LexToken(VAR,'i',1,40709) LexToken(COMMA,',',1,40710) LexToken(VAR,'i',1,40711) -LexToken(OPERATOR,'+',1,40712) +LexToken(ADDITION,'+',1,40712) LexToken(VAR,'N',1,40713) LexToken(CLOSEBRACKET,')',1,40714) LexToken(ASSIGNMENT,'=',1,40715) LexToken(NUMBER,'2',1,40716) -LexToken(OPERATOR,'*',1,40717) +LexToken(MULTIPLICATION,'*',1,40717) LexToken(OPENBRACKET,'(',1,40718) LexToken(VAR,'x',1,40719) LexToken(OPENBRACKET,'(',1,40720) LexToken(VAR,'i',1,40721) -LexToken(OPERATOR,'+',1,40722) +LexToken(ADDITION,'+',1,40722) LexToken(NUMBER,'1',1,40723) LexToken(CLOSEBRACKET,')',1,40724) -LexToken(OPERATOR,'-',1,40725) +LexToken(ADDITION,'-',1,40725) LexToken(VAR,'x',1,40726) LexToken(OPENBRACKET,'(',1,40727) LexToken(VAR,'i',1,40728) @@ -10017,22 +10071,22 @@ LexToken(EOL,'\n',1,40731) LexToken(VAR,'Q',1,40740) LexToken(OPENBRACKET,'(',1,40741) LexToken(VAR,'i',1,40742) -LexToken(OPERATOR,'+',1,40743) +LexToken(ADDITION,'+',1,40743) LexToken(VAR,'N',1,40744) LexToken(COMMA,',',1,40745) LexToken(VAR,'i',1,40746) LexToken(CLOSEBRACKET,')',1,40747) LexToken(ASSIGNMENT,'=',1,40748) LexToken(NUMBER,'2',1,40749) -LexToken(OPERATOR,'*',1,40750) +LexToken(MULTIPLICATION,'*',1,40750) LexToken(OPENBRACKET,'(',1,40751) LexToken(VAR,'x',1,40752) LexToken(OPENBRACKET,'(',1,40753) LexToken(VAR,'i',1,40754) -LexToken(OPERATOR,'+',1,40755) +LexToken(ADDITION,'+',1,40755) LexToken(NUMBER,'1',1,40756) LexToken(CLOSEBRACKET,')',1,40757) -LexToken(OPERATOR,'-',1,40758) +LexToken(ADDITION,'-',1,40758) LexToken(VAR,'x',1,40759) LexToken(OPENBRACKET,'(',1,40760) LexToken(VAR,'i',1,40761) @@ -10042,11 +10096,11 @@ LexToken(EOL,'\n',1,40764) LexToken(VAR,'Q',1,40773) LexToken(OPENBRACKET,'(',1,40774) LexToken(VAR,'i',1,40775) -LexToken(OPERATOR,'+',1,40776) +LexToken(ADDITION,'+',1,40776) LexToken(VAR,'N',1,40777) LexToken(COMMA,',',1,40778) LexToken(VAR,'i',1,40779) -LexToken(OPERATOR,'+',1,40780) +LexToken(ADDITION,'+',1,40780) LexToken(VAR,'N',1,40781) LexToken(CLOSEBRACKET,')',1,40782) LexToken(ASSIGNMENT,'=',1,40783) @@ -10069,14 +10123,16 @@ LexToken(COMMA,',',1,40810) LexToken(VAR,'zeros',1,40811) LexToken(OPENBRACKET,'(',1,40816) LexToken(NUMBER,'3',1,40817) -LexToken(OPERATOR,'*',1,40818) +LexToken(MULTIPLICATION,'*',1,40818) LexToken(VAR,'N',1,40819) -LexToken(NUMBER,'-1',1,40820) +LexToken(ADDITION,'-',1,40820) +LexToken(NUMBER,'1',1,40821) LexToken(COMMA,',',1,40822) LexToken(NUMBER,'3',1,40823) -LexToken(OPERATOR,'*',1,40824) +LexToken(MULTIPLICATION,'*',1,40824) LexToken(VAR,'N',1,40825) -LexToken(NUMBER,'-1',1,40826) +LexToken(ADDITION,'-',1,40826) +LexToken(NUMBER,'1',1,40827) LexToken(CLOSEBRACKET,')',1,40828) LexToken(CLOSESQBRACKET,']',1,40829) LexToken(EOL,'\n',1,40830) @@ -10086,7 +10142,7 @@ LexToken(OPENSQBRACKET,'[',1,40838) LexToken(VAR,'zeros',1,40839) LexToken(OPENBRACKET,'(',1,40844) LexToken(NUMBER,'3',1,40845) -LexToken(OPERATOR,'*',1,40846) +LexToken(MULTIPLICATION,'*',1,40846) LexToken(VAR,'N',1,40847) LexToken(COMMA,',',1,40848) LexToken(NUMBER,'1',1,40849) @@ -10098,7 +10154,7 @@ LexToken(EOL,'\n',1,40854) LexToken(VAR,'Zt',1,40859) LexToken(ASSIGNMENT,'=',1,40861) LexToken(VAR,'At',1,40862) -LexToken(OPERATOR,'\\',1,40864) +LexToken(MULTIPLICATION,'\\',1,40864) LexToken(VAR,'Bt',1,40865) LexToken(SEMICOLON,';',1,40867) LexToken(EOL,'\n',1,40868) @@ -10109,7 +10165,7 @@ LexToken(OPENBRACKET,'(',1,40877) LexToken(NUMBER,'1',1,40878) LexToken(COLON,':',1,40879) LexToken(NUMBER,'3',1,40880) -LexToken(OPERATOR,'*',1,40881) +LexToken(MULTIPLICATION,'*',1,40881) LexToken(VAR,'N',1,40882) LexToken(COMMA,',',1,40883) LexToken(NUMBER,'1',1,40884) diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 883749e7..d5c1b88c 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -102,7 +102,7 @@ LexToken(VAR,'rpar',1,1086) LexToken(COMMA,',',1,1090) LexToken(DQSTRING,'"*"',1,1093) LexToken(CLOSEBRACKET,')',1,1094) -LexToken(OPERATOR,'/',1,1095) +LexToken(MULTIPLICATION,'/',1,1095) LexToken(NUMBER,'2',1,1096) LexToken(EOL,'\n',1,1097) LexToken(VAR,'xx',1,1106) @@ -120,11 +120,11 @@ LexToken(ASSIGNMENT,'=',1,1130) LexToken(VAR,'rpar',1,1131) LexToken(OPENBRACKET,'(',1,1135) LexToken(VAR,'n',1,1136) -LexToken(OPERATOR,'+',1,1137) +LexToken(ADDITION,'+',1,1137) LexToken(NUMBER,'1',1,1138) LexToken(COLON,':',1,1139) LexToken(NUMBER,'2',1,1140) -LexToken(OPERATOR,'*',1,1141) +LexToken(MULTIPLICATION,'*',1,1141) LexToken(VAR,'n',1,1142) LexToken(CLOSEBRACKET,')',1,1143) LexToken(EOL,'\n',1,1144) @@ -211,13 +211,14 @@ LexToken(NUMBER,'2',1,1530) LexToken(COLON,':',1,1531) LexToken(VAR,'n',1,1532) LexToken(CLOSEBRACKET,')',1,1533) -LexToken(OPERATOR,'-',1,1534) +LexToken(ADDITION,'-',1,1534) LexToken(VAR,'xx',1,1535) LexToken(OPENBRACKET,'(',1,1537) LexToken(NUMBER,'1',1,1538) LexToken(COLON,':',1,1539) LexToken(VAR,'n',1,1540) -LexToken(NUMBER,'-1',1,1541) +LexToken(ADDITION,'-',1,1541) +LexToken(NUMBER,'1',1,1542) LexToken(CLOSEBRACKET,')',1,1543) LexToken(COMPARISON,'<=',1,1544) LexToken(NUMBER,'0',1,1546) @@ -307,19 +308,23 @@ LexToken(DOT,'.',1,1963) LexToken(VAR,'rpar',1,1964) LexToken(ASSIGNMENT,'=',1,1968) LexToken(OPENSQBRACKET,'[',1,1969) -LexToken(NUMBER,'-2',1,1970) +LexToken(ADDITION,'-',1,1970) +LexToken(NUMBER,'2',1,1971) LexToken(SEMICOLON,';',1,1972) -LexToken(NUMBER,'-1',1,1973) +LexToken(ADDITION,'-',1,1973) +LexToken(NUMBER,'1',1,1974) LexToken(SEMICOLON,';',1,1975) LexToken(NUMBER,'1',1,1976) LexToken(SEMICOLON,';',1,1977) LexToken(NUMBER,'2',1,1978) LexToken(SEMICOLON,';',1,1979) -LexToken(NUMBER,'-1',1,1980) +LexToken(ADDITION,'-',1,1980) +LexToken(NUMBER,'1',1,1981) LexToken(SEMICOLON,';',1,1982) LexToken(NUMBER,'1',1,1983) LexToken(SEMICOLON,';',1,1984) -LexToken(NUMBER,'-1',1,1985) +LexToken(ADDITION,'-',1,1985) +LexToken(NUMBER,'1',1,1986) LexToken(SEMICOLON,';',1,1987) LexToken(NUMBER,'1',1,1988) LexToken(CLOSESQBRACKET,']',1,1989) diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index dd7650a4..813fd328 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -151,7 +151,8 @@ LexToken(THEN,'then',1,1402) LexToken(EOL,'\n',1,1406) LexToken(VAR,'zcr',1,1423) LexToken(ASSIGNMENT,'=',1,1426) -LexToken(NUMBER,'-1',1,1427) +LexToken(ADDITION,'-',1,1427) +LexToken(NUMBER,'1',1,1428) LexToken(COMMA,',',1,1429) LexToken(EOL,'\n',1,1430) LexToken(END,'end',1,1443) @@ -214,7 +215,8 @@ LexToken(VAR,'model',1,1760) LexToken(COMMA,',',1,1765) LexToken(VAR,'graphics',1,1766) LexToken(COMMA,',',1,1774) -LexToken(NUMBER,'-1',1,1775) +LexToken(ADDITION,'-',1,1775) +LexToken(NUMBER,'1',1,1776) LexToken(COMMA,',',1,1777) LexToken(NUMBER,'1',1,1778) LexToken(COMMA,',',1,1779) @@ -242,12 +244,15 @@ LexToken(COMMA,',',1,1862) LexToken(VAR,'graphics',1,1863) LexToken(COMMA,',',1,1871) LexToken(OPENSQBRACKET,'[',1,1872) -LexToken(NUMBER,'-1',1,1873) +LexToken(ADDITION,'-',1,1873) +LexToken(NUMBER,'1',1,1874) LexToken(COMMA,',',1,1875) -LexToken(NUMBER,'-1',1,1876) +LexToken(ADDITION,'-',1,1876) +LexToken(NUMBER,'1',1,1877) LexToken(CLOSESQBRACKET,']',1,1878) LexToken(COMMA,',',1,1879) -LexToken(NUMBER,'-1',1,1880) +LexToken(ADDITION,'-',1,1880) +LexToken(NUMBER,'1',1,1881) LexToken(COMMA,',',1,1882) LexToken(OPENSQBRACKET,'[',1,1883) LexToken(CLOSESQBRACKET,']',1,1884) @@ -331,7 +336,7 @@ LexToken(DOT,'.',1,2378) LexToken(VAR,'style',1,2379) LexToken(ASSIGNMENT,'=',1,2384) LexToken(DQSTRING,'"MAXMIN;displayedLabel="',1,2408) -LexToken(OPERATOR,'+',1,2410) +LexToken(ADDITION,'+',1,2410) LexToken(VAR,'label',1,2412) LexToken(SEMICOLON,';',1,2417) LexToken(EOL,'\n',1,2418) @@ -394,7 +399,8 @@ LexToken(VAR,'model',1,2691) LexToken(DOT,'.',1,2696) LexToken(VAR,'in',1,2697) LexToken(ASSIGNMENT,'=',1,2699) -LexToken(NUMBER,'-1',1,2700) +LexToken(ADDITION,'-',1,2700) +LexToken(NUMBER,'1',1,2701) LexToken(EOL,'\n',1,2702) LexToken(VAR,'model',1,2711) LexToken(DOT,'.',1,2716) diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 623b30e9..ef776c62 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -73,7 +73,8 @@ LexToken(THEN,'then',1,974) LexToken(EOL,'\n',1,978) LexToken(VAR,'in',1,987) LexToken(ASSIGNMENT,'=',1,989) -LexToken(NUMBER,'-1',1,990) +LexToken(ADDITION,'-',1,990) +LexToken(NUMBER,'1',1,991) LexToken(EOL,'\n',1,992) LexToken(VAR,'model',1,1001) LexToken(ASSIGNMENT,'=',1,1006) diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 4d062493..543cf996 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -73,7 +73,8 @@ LexToken(THEN,'then',1,974) LexToken(EOL,'\n',1,978) LexToken(VAR,'in',1,987) LexToken(ASSIGNMENT,'=',1,989) -LexToken(NUMBER,'-1',1,990) +LexToken(ADDITION,'-',1,990) +LexToken(NUMBER,'1',1,991) LexToken(EOL,'\n',1,992) LexToken(VAR,'model',1,1001) LexToken(ASSIGNMENT,'=',1,1006) diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 8ee4b9e2..324d9f73 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -245,13 +245,15 @@ LexToken(VAR,'model',1,1805) LexToken(DOT,'.',1,1810) LexToken(VAR,'in',1,1811) LexToken(ASSIGNMENT,'=',1,1813) -LexToken(NUMBER,'-1',1,1814) +LexToken(ADDITION,'-',1,1814) +LexToken(NUMBER,'1',1,1815) LexToken(EOL,'\n',1,1816) LexToken(VAR,'model',1,1825) LexToken(DOT,'.',1,1830) LexToken(VAR,'out',1,1831) LexToken(ASSIGNMENT,'=',1,1834) -LexToken(NUMBER,'-1',1,1835) +LexToken(ADDITION,'-',1,1835) +LexToken(NUMBER,'1',1,1836) LexToken(EOL,'\n',1,1837) LexToken(VAR,'model',1,1846) LexToken(DOT,'.',1,1851) diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index cc736de4..864980fc 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -113,7 +113,8 @@ LexToken(VAR,'list',1,1292) LexToken(OPENBRACKET,'(',1,1296) LexToken(DQSTRING,'"vec"',1,1301) LexToken(COMMA,',',1,1302) -LexToken(NUMBER,'-1',1,1303) +LexToken(ADDITION,'-',1,1303) +LexToken(NUMBER,'1',1,1304) LexToken(CLOSEBRACKET,')',1,1305) LexToken(COMMA,',',1,1306) LexToken(VAR,'exprs',1,1307) @@ -171,7 +172,8 @@ LexToken(THEN,'then',1,1582) LexToken(EOL,'\n',1,1586) LexToken(VAR,'in',1,1607) LexToken(ASSIGNMENT,'=',1,1609) -LexToken(NUMBER,'-1',1,1610) +LexToken(ADDITION,'-',1,1610) +LexToken(NUMBER,'1',1,1611) LexToken(EOL,'\n',1,1612) LexToken(VAR,'sgn',1,1633) LexToken(ASSIGNMENT,'=',1,1636) @@ -186,7 +188,7 @@ LexToken(ELSE,'else',1,1683) LexToken(EOL,'\n',1,1687) LexToken(VAR,'in',1,1708) LexToken(ASSIGNMENT,'=',1,1710) -LexToken(OPERATOR,'-',1,1711) +LexToken(ADDITION,'-',1,1711) LexToken(VAR,'ones',1,1712) LexToken(OPENBRACKET,'(',1,1716) LexToken(VAR,'sgn',1,1717) @@ -205,7 +207,8 @@ LexToken(CLOSEBRACKET,')',1,1758) LexToken(EOL,'\n',1,1759) LexToken(VAR,'nout',1,1780) LexToken(ASSIGNMENT,'=',1,1784) -LexToken(NUMBER,'-1',1,1785) +LexToken(ADDITION,'-',1,1785) +LexToken(NUMBER,'1',1,1786) LexToken(EOL,'\n',1,1787) LexToken(END,'end',1,1804) LexToken(EOL,'\n',1,1807) @@ -237,7 +240,7 @@ LexToken(ELSE,'else',1,1967) LexToken(EOL,'\n',1,1971) LexToken(VAR,'in',1,1992) LexToken(ASSIGNMENT,'=',1,1994) -LexToken(OPERATOR,'-',1,1995) +LexToken(ADDITION,'-',1,1995) LexToken(VAR,'ones',1,1996) LexToken(OPENBRACKET,'(',1,2000) LexToken(VAR,'size',1,2001) @@ -252,7 +255,8 @@ LexToken(CLOSEBRACKET,')',1,2014) LexToken(EOL,'\n',1,2015) LexToken(VAR,'nout',1,2036) LexToken(ASSIGNMENT,'=',1,2040) -LexToken(NUMBER,'-1',1,2041) +LexToken(ADDITION,'-',1,2041) +LexToken(NUMBER,'1',1,2042) LexToken(EOL,'\n',1,2043) LexToken(END,'end',1,2060) LexToken(EOL,'\n',1,2063) @@ -333,7 +337,8 @@ LexToken(ASSIGNMENT,'=',1,2436) LexToken(OPENSQBRACKET,'[',1,2437) LexToken(NUMBER,'1',1,2438) LexToken(SEMICOLON,';',1,2439) -LexToken(NUMBER,'-1',1,2440) +LexToken(ADDITION,'-',1,2440) +LexToken(NUMBER,'1',1,2441) LexToken(CLOSESQBRACKET,']',1,2442) LexToken(EOL,'\n',1,2443) LexToken(VAR,'model',1,2452) @@ -358,16 +363,19 @@ LexToken(DOT,'.',1,2522) LexToken(VAR,'in',1,2523) LexToken(ASSIGNMENT,'=',1,2525) LexToken(OPENSQBRACKET,'[',1,2526) -LexToken(NUMBER,'-1',1,2527) +LexToken(ADDITION,'-',1,2527) +LexToken(NUMBER,'1',1,2528) LexToken(SEMICOLON,';',1,2529) -LexToken(NUMBER,'-1',1,2530) +LexToken(ADDITION,'-',1,2530) +LexToken(NUMBER,'1',1,2531) LexToken(CLOSESQBRACKET,']',1,2532) LexToken(EOL,'\n',1,2533) LexToken(VAR,'model',1,2542) LexToken(DOT,'.',1,2547) LexToken(VAR,'out',1,2548) LexToken(ASSIGNMENT,'=',1,2551) -LexToken(NUMBER,'-1',1,2552) +LexToken(ADDITION,'-',1,2552) +LexToken(NUMBER,'1',1,2553) LexToken(EOL,'\n',1,2554) LexToken(VAR,'model',1,2563) LexToken(DOT,'.',1,2568) diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 79e13601..ed763971 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -97,16 +97,19 @@ LexToken(DOT,'.',1,1083) LexToken(VAR,'in',1,1084) LexToken(ASSIGNMENT,'=',1,1086) LexToken(OPENSQBRACKET,'[',1,1087) -LexToken(NUMBER,'-1',1,1088) +LexToken(ADDITION,'-',1,1088) +LexToken(NUMBER,'1',1,1089) LexToken(SEMICOLON,';',1,1090) -LexToken(NUMBER,'-1',1,1091) +LexToken(ADDITION,'-',1,1091) +LexToken(NUMBER,'1',1,1092) LexToken(CLOSESQBRACKET,']',1,1093) LexToken(EOL,'\n',1,1094) LexToken(VAR,'model',1,1103) LexToken(DOT,'.',1,1108) LexToken(VAR,'out',1,1109) LexToken(ASSIGNMENT,'=',1,1112) -LexToken(NUMBER,'-1',1,1113) +LexToken(ADDITION,'-',1,1113) +LexToken(NUMBER,'1',1,1114) LexToken(EOL,'\n',1,1115) LexToken(VAR,'model',1,1124) LexToken(DOT,'.',1,1129) diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 2c41b907..d5e987f7 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -267,13 +267,15 @@ LexToken(VAR,'model',1,2079) LexToken(DOT,'.',1,2084) LexToken(VAR,'in',1,2085) LexToken(ASSIGNMENT,'=',1,2087) -LexToken(NUMBER,'-1',1,2088) +LexToken(ADDITION,'-',1,2088) +LexToken(NUMBER,'1',1,2089) LexToken(EOL,'\n',1,2090) LexToken(VAR,'model',1,2099) LexToken(DOT,'.',1,2104) LexToken(VAR,'out',1,2105) LexToken(ASSIGNMENT,'=',1,2108) -LexToken(NUMBER,'-1',1,2109) +LexToken(ADDITION,'-',1,2109) +LexToken(NUMBER,'1',1,2110) LexToken(EOL,'\n',1,2111) LexToken(VAR,'model',1,2120) LexToken(DOT,'.',1,2125) diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 4d074505..7e81c4af 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -235,7 +235,8 @@ LexToken(THEN,'then',1,1887) LexToken(EOL,'\n',1,1891) LexToken(VAR,'minp',1,1900) LexToken(ASSIGNMENT,'=',1,1904) -LexToken(NUMBER,'-1',1,1905) +LexToken(ADDITION,'-',1,1905) +LexToken(NUMBER,'1',1,1906) LexToken(SEMICOLON,';',1,1907) LexToken(EOL,'\n',1,1908) LexToken(VAR,'maxp',1,1917) diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 132b1066..18582df9 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -171,11 +171,11 @@ LexToken(VAR,'rpar',1,1494) LexToken(ASSIGNMENT,'=',1,1498) LexToken(OPENSQBRACKET,'[',1,1499) LexToken(VAR,'minp',1,1500) -LexToken(OPERATOR,'/',1,1504) +LexToken(MULTIPLICATION,'/',1,1504) LexToken(VAR,'pente',1,1505) LexToken(SEMICOLON,';',1,1510) LexToken(VAR,'maxp',1,1511) -LexToken(OPERATOR,'/',1,1515) +LexToken(MULTIPLICATION,'/',1,1515) LexToken(VAR,'pente',1,1516) LexToken(SEMICOLON,';',1,1521) LexToken(VAR,'pente',1,1522) @@ -225,7 +225,8 @@ LexToken(THEN,'then',1,1781) LexToken(EOL,'\n',1,1785) LexToken(VAR,'minp',1,1794) LexToken(ASSIGNMENT,'=',1,1798) -LexToken(NUMBER,'-1',1,1799) +LexToken(ADDITION,'-',1,1799) +LexToken(NUMBER,'1',1,1800) LexToken(SEMICOLON,';',1,1801) LexToken(EOL,'\n',1,1802) LexToken(VAR,'maxp',1,1811) diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index c726a624..6e79e1c1 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -147,14 +147,16 @@ LexToken(VAR,'model',1,1404) LexToken(DOT,'.',1,1409) LexToken(VAR,'nmode',1,1410) LexToken(ASSIGNMENT,'=',1,1415) -LexToken(NUMBER,'-1',1,1416) +LexToken(ADDITION,'-',1,1416) +LexToken(NUMBER,'1',1,1417) LexToken(SEMICOLON,';',1,1418) LexToken(EOL,'\n',1,1419) LexToken(VAR,'model',1,1440) LexToken(DOT,'.',1,1445) LexToken(VAR,'nzcross',1,1446) LexToken(ASSIGNMENT,'=',1,1453) -LexToken(NUMBER,'-1',1,1454) +LexToken(ADDITION,'-',1,1454) +LexToken(NUMBER,'1',1,1455) LexToken(SEMICOLON,';',1,1456) LexToken(EOL,'\n',1,1457) LexToken(ELSE,'else',1,1474) @@ -200,7 +202,8 @@ LexToken(THEN,'then',1,1706) LexToken(EOL,'\n',1,1710) LexToken(VAR,'nu',1,1719) LexToken(ASSIGNMENT,'=',1,1721) -LexToken(NUMBER,'-1',1,1722) +LexToken(ADDITION,'-',1,1722) +LexToken(NUMBER,'1',1,1723) LexToken(EOL,'\n',1,1724) LexToken(VAR,'model',1,1733) LexToken(ASSIGNMENT,'=',1,1738) diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 605835fd..bdae0c30 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -87,13 +87,15 @@ LexToken(VAR,'model',1,1046) LexToken(DOT,'.',1,1051) LexToken(VAR,'in',1,1052) LexToken(ASSIGNMENT,'=',1,1054) -LexToken(NUMBER,'-1',1,1055) +LexToken(ADDITION,'-',1,1055) +LexToken(NUMBER,'1',1,1056) LexToken(EOL,'\n',1,1057) LexToken(VAR,'model',1,1066) LexToken(DOT,'.',1,1071) LexToken(VAR,'out',1,1072) LexToken(ASSIGNMENT,'=',1,1075) -LexToken(NUMBER,'-1',1,1076) +LexToken(ADDITION,'-',1,1076) +LexToken(NUMBER,'1',1,1077) LexToken(EOL,'\n',1,1078) LexToken(VAR,'model',1,1087) LexToken(DOT,'.',1,1092) diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 2ecf6304..497bf134 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -82,7 +82,8 @@ LexToken(THEN,'then',1,1003) LexToken(EOL,'\n',1,1007) LexToken(VAR,'in',1,1016) LexToken(ASSIGNMENT,'=',1,1018) -LexToken(NUMBER,'-1',1,1019) +LexToken(ADDITION,'-',1,1019) +LexToken(NUMBER,'1',1,1020) LexToken(EOL,'\n',1,1021) LexToken(VAR,'model',1,1030) LexToken(ASSIGNMENT,'=',1,1035) diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 5d9f90fb..6321322b 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -120,7 +120,7 @@ LexToken(PREVAR,'%GG',1,1179) LexToken(ASSIGNMENT,'=',1,1182) LexToken(OPENSQBRACKET,'[',1,1183) LexToken(DQSTRING,'"Choose among "',1,1198) -LexToken(OPERATOR,'+',1,1199) +LexToken(ADDITION,'+',1,1199) LexToken(VAR,'strcat',1,1200) LexToken(OPENBRACKET,'(',1,1206) LexToken(PREVAR,'%FF',1,1207) @@ -199,9 +199,9 @@ LexToken(EOL,'\n',1,1445) LexToken(VAR,'message',1,1462) LexToken(OPENBRACKET,'(',1,1469) LexToken(DQSTRING,'"Sorry but "',1,1481) -LexToken(OPERATOR,'+',1,1482) +LexToken(ADDITION,'+',1,1482) LexToken(VAR,'fun',1,1483) -LexToken(OPERATOR,'+',1,1487) +LexToken(ADDITION,'+',1,1487) LexToken(DQSTRING,'" is not in the list!"',1,1509) LexToken(CLOSEBRACKET,')',1,1510) LexToken(EOL,'\n',1,1511) @@ -216,9 +216,9 @@ LexToken(EOL,'\n',1,1565) LexToken(VAR,'execstr',1,1582) LexToken(OPENBRACKET,'(',1,1589) LexToken(DQSTRING,'"model.sim=list(\\\'"',1,1608) -LexToken(OPERATOR,'+',1,1609) +LexToken(ADDITION,'+',1,1609) LexToken(VAR,'fun',1,1610) -LexToken(OPERATOR,'+',1,1613) +LexToken(ADDITION,'+',1,1613) LexToken(DQSTRING,'"_blk\\\',4)"',1,1624) LexToken(CLOSEBRACKET,')',1,1625) LexToken(EOL,'\n',1,1626) @@ -266,13 +266,15 @@ LexToken(VAR,'model',1,1840) LexToken(DOT,'.',1,1845) LexToken(VAR,'in',1,1846) LexToken(ASSIGNMENT,'=',1,1848) -LexToken(NUMBER,'-1',1,1849) +LexToken(ADDITION,'-',1,1849) +LexToken(NUMBER,'1',1,1850) LexToken(EOL,'\n',1,1851) LexToken(VAR,'model',1,1860) LexToken(DOT,'.',1,1865) LexToken(VAR,'out',1,1866) LexToken(ASSIGNMENT,'=',1,1869) -LexToken(NUMBER,'-1',1,1870) +LexToken(ADDITION,'-',1,1870) +LexToken(NUMBER,'1',1,1871) LexToken(EOL,'\n',1,1872) LexToken(VAR,'model',1,1881) LexToken(DOT,'.',1,1886) diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 8430301d..4dfee5e7 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -37,1328 +37,1328 @@ LexToken(COMMA,',',1,848) LexToken(VAR,'arg2',1,849) LexToken(CLOSEBRACKET,')',1,853) LexToken(EOL,'\n',1,854) -LexToken(EOL,'\n',1,884) -LexToken(EOL,'\n',1,987) -LexToken(EOL,'\n',1,1088) -LexToken(EOL,'\n',1,1189) -LexToken(EOL,'\n',1,1190) -LexToken(VAR,'x',1,1195) -LexToken(ASSIGNMENT,'=',1,1196) -LexToken(OPENSQBRACKET,'[',1,1197) -LexToken(CLOSESQBRACKET,']',1,1198) -LexToken(SEMICOLON,';',1,1199) -LexToken(EOL,'\n',1,1200) -LexToken(VAR,'y',1,1205) -LexToken(ASSIGNMENT,'=',1,1206) -LexToken(OPENSQBRACKET,'[',1,1207) -LexToken(CLOSESQBRACKET,']',1,1208) -LexToken(SEMICOLON,';',1,1209) -LexToken(EOL,'\n',1,1210) -LexToken(VAR,'typ',1,1215) -LexToken(ASSIGNMENT,'=',1,1218) -LexToken(OPENSQBRACKET,'[',1,1219) -LexToken(CLOSESQBRACKET,']',1,1220) -LexToken(SEMICOLON,';',1,1221) -LexToken(EOL,'\n',1,1222) -LexToken(EOL,'\n',1,1223) -LexToken(SELECT,'select',1,1228) -LexToken(VAR,'job',1,1235) -LexToken(EOL,'\n',1,1238) -LexToken(CASE,'case',1,1243) -LexToken(DQSTRING,'"set"',1,1252) -LexToken(THEN,'then',1,1254) -LexToken(EOL,'\n',1,1258) -LexToken(VAR,'x',1,1267) -LexToken(ASSIGNMENT,'=',1,1268) -LexToken(VAR,'arg1',1,1269) -LexToken(SEMICOLON,';',1,1273) -LexToken(EOL,'\n',1,1274) -LexToken(VAR,'graphics',1,1283) -LexToken(ASSIGNMENT,'=',1,1291) -LexToken(VAR,'arg1',1,1292) -LexToken(DOT,'.',1,1296) -LexToken(VAR,'graphics',1,1297) -LexToken(SEMICOLON,';',1,1305) -LexToken(EOL,'\n',1,1306) -LexToken(VAR,'label',1,1315) -LexToken(ASSIGNMENT,'=',1,1320) -LexToken(VAR,'graphics',1,1321) -LexToken(DOT,'.',1,1329) -LexToken(VAR,'exprs',1,1330) -LexToken(EOL,'\n',1,1335) -LexToken(VAR,'model',1,1344) -LexToken(ASSIGNMENT,'=',1,1349) -LexToken(VAR,'arg1',1,1350) -LexToken(DOT,'.',1,1354) -LexToken(VAR,'model',1,1355) -LexToken(SEMICOLON,';',1,1360) -LexToken(EOL,'\n',1,1361) -LexToken(VAR,'params_pde',1,1370) -LexToken(ASSIGNMENT,'=',1,1380) -LexToken(VAR,'label',1,1381) -LexToken(OPENBRACKET,'(',1,1386) -LexToken(NUMBER,'1',1,1387) -LexToken(CLOSEBRACKET,')',1,1388) -LexToken(SEMICOLON,';',1,1389) -LexToken(EOL,'\n',1,1390) -LexToken(EOL,'\n',1,1391) -LexToken(WHILE,'while',1,1400) -LexToken(PREVAR_BOOLEAN,'%t',1,1406) -LexToken(DO,'do',1,1409) -LexToken(EOL,'\n',1,1411) -LexToken(OPENSQBRACKET,'[',1,1424) -LexToken(VAR,'ln',1,1425) -LexToken(COMMA,',',1,1427) -LexToken(VAR,'fun',1,1428) -LexToken(CLOSESQBRACKET,']',1,1431) -LexToken(ASSIGNMENT,'=',1,1432) -LexToken(WHERE,'where',1,1433) -LexToken(OPENBRACKET,'(',1,1438) -LexToken(CLOSEBRACKET,')',1,1439) -LexToken(SEMICOLON,';',1,1440) -LexToken(EOL,'\n',1,1441) -LexToken(IF,'if',1,1454) -LexToken(NOT,'~',1,1457) -LexToken(VAR,'or',1,1458) -LexToken(OPENBRACKET,'(',1,1460) -LexToken(VAR,'fun',1,1461) -LexToken(COMPARISON,'==',1,1465) -LexToken(DQSTRING,'"do_eval"',1,1476) -LexToken(CLOSEBRACKET,')',1,1477) -LexToken(THEN,'then',1,1479) -LexToken(EOL,'\n',1,1499) -LexToken(OPENSQBRACKET,'[',1,1516) -LexToken(VAR,'ok',1,1517) -LexToken(COMMA,',',1,1519) -LexToken(VAR,'a_domaine',1,1520) -LexToken(COMMA,',',1,1529) -LexToken(VAR,'b_domaine',1,1530) -LexToken(COMMA,',',1,1539) -LexToken(VAR,'discr',1,1540) -LexToken(COMMA,',',1,1545) -LexToken(VAR,'signe',1,1546) -LexToken(COMMA,',',1,1551) -LexToken(VAR,'choix',1,1552) -LexToken(COMMA,',',1,1557) -LexToken(VAR,'type_meth',1,1558) -LexToken(COMMA,',',1,1567) -LexToken(VAR,'degre',1,1568) -LexToken(COMMA,',',1,1573) -LexToken(VAR,'Nbr_maillage',1,1574) -LexToken(COMMA,',',1,1586) -LexToken(VAR,'CI',1,1606) -LexToken(COMMA,',',1,1608) -LexToken(VAR,'CI1',1,1609) -LexToken(COMMA,',',1,1612) -LexToken(VAR,'CLa_type',1,1613) -LexToken(COMMA,',',1,1621) -LexToken(VAR,'CLa_exp',1,1622) -LexToken(COMMA,',',1,1629) -LexToken(VAR,'CLb_type',1,1630) -LexToken(COMMA,',',1,1638) -LexToken(VAR,'CLb_exp',1,1639) -LexToken(COMMA,',',1,1646) -LexToken(VAR,'oper',1,1647) -LexToken(COMMA,',',1,1651) -LexToken(VAR,'a1',1,1652) -LexToken(COMMA,',',1,1654) -LexToken(VAR,'b1',1,1655) -LexToken(COMMA,',',1,1657) -LexToken(VAR,'a2',1,1658) -LexToken(COMMA,',',1,1660) -LexToken(VAR,'b2',1,1661) -LexToken(COMMA,',',1,1663) -LexToken(VAR,'a3',1,1664) -LexToken(COMMA,',',1,1666) -LexToken(VAR,'b3',1,1667) -LexToken(COMMA,',',1,1669) -LexToken(VAR,'a4',1,1670) -LexToken(COMMA,',',1,1672) -LexToken(VAR,'b4',1,1673) -LexToken(COMMA,',',1,1675) -LexToken(VAR,'a5',1,1676) -LexToken(COMMA,',',1,1678) -LexToken(VAR,'b5',1,1679) -LexToken(COMMA,',',1,1681) -LexToken(VAR,'a6',1,1701) -LexToken(COMMA,',',1,1703) -LexToken(VAR,'b6',1,1704) -LexToken(COMMA,',',1,1706) -LexToken(VAR,'a7',1,1707) -LexToken(COMMA,',',1,1709) -LexToken(VAR,'b7',1,1710) -LexToken(COMMA,',',1,1712) -LexToken(VAR,'k',1,1713) +LexToken(EOL,'\n',1,886) +LexToken(EOL,'\n',1,989) +LexToken(EOL,'\n',1,1090) +LexToken(EOL,'\n',1,1191) +LexToken(EOL,'\n',1,1192) +LexToken(VAR,'x',1,1197) +LexToken(ASSIGNMENT,'=',1,1198) +LexToken(OPENSQBRACKET,'[',1,1199) +LexToken(CLOSESQBRACKET,']',1,1200) +LexToken(SEMICOLON,';',1,1201) +LexToken(EOL,'\n',1,1202) +LexToken(VAR,'y',1,1207) +LexToken(ASSIGNMENT,'=',1,1208) +LexToken(OPENSQBRACKET,'[',1,1209) +LexToken(CLOSESQBRACKET,']',1,1210) +LexToken(SEMICOLON,';',1,1211) +LexToken(EOL,'\n',1,1212) +LexToken(VAR,'typ',1,1217) +LexToken(ASSIGNMENT,'=',1,1220) +LexToken(OPENSQBRACKET,'[',1,1221) +LexToken(CLOSESQBRACKET,']',1,1222) +LexToken(SEMICOLON,';',1,1223) +LexToken(EOL,'\n',1,1224) +LexToken(EOL,'\n',1,1225) +LexToken(SELECT,'select',1,1230) +LexToken(VAR,'job',1,1237) +LexToken(EOL,'\n',1,1240) +LexToken(CASE,'case',1,1245) +LexToken(DQSTRING,'"set"',1,1254) +LexToken(THEN,'then',1,1256) +LexToken(EOL,'\n',1,1260) +LexToken(VAR,'x',1,1269) +LexToken(ASSIGNMENT,'=',1,1270) +LexToken(VAR,'arg1',1,1271) +LexToken(SEMICOLON,';',1,1275) +LexToken(EOL,'\n',1,1276) +LexToken(VAR,'graphics',1,1285) +LexToken(ASSIGNMENT,'=',1,1293) +LexToken(VAR,'arg1',1,1294) +LexToken(DOT,'.',1,1298) +LexToken(VAR,'graphics',1,1299) +LexToken(SEMICOLON,';',1,1307) +LexToken(EOL,'\n',1,1308) +LexToken(VAR,'label',1,1317) +LexToken(ASSIGNMENT,'=',1,1322) +LexToken(VAR,'graphics',1,1323) +LexToken(DOT,'.',1,1331) +LexToken(VAR,'exprs',1,1332) +LexToken(EOL,'\n',1,1337) +LexToken(VAR,'model',1,1346) +LexToken(ASSIGNMENT,'=',1,1351) +LexToken(VAR,'arg1',1,1352) +LexToken(DOT,'.',1,1356) +LexToken(VAR,'model',1,1357) +LexToken(SEMICOLON,';',1,1362) +LexToken(EOL,'\n',1,1363) +LexToken(VAR,'params_pde',1,1372) +LexToken(ASSIGNMENT,'=',1,1382) +LexToken(VAR,'label',1,1383) +LexToken(OPENBRACKET,'(',1,1388) +LexToken(NUMBER,'1',1,1389) +LexToken(CLOSEBRACKET,')',1,1390) +LexToken(SEMICOLON,';',1,1391) +LexToken(EOL,'\n',1,1392) +LexToken(EOL,'\n',1,1393) +LexToken(WHILE,'while',1,1402) +LexToken(PREVAR_BOOLEAN,'%t',1,1408) +LexToken(DO,'do',1,1411) +LexToken(EOL,'\n',1,1413) +LexToken(OPENSQBRACKET,'[',1,1426) +LexToken(VAR,'ln',1,1427) +LexToken(COMMA,',',1,1429) +LexToken(VAR,'fun',1,1430) +LexToken(CLOSESQBRACKET,']',1,1433) +LexToken(ASSIGNMENT,'=',1,1434) +LexToken(WHERE,'where',1,1435) +LexToken(OPENBRACKET,'(',1,1440) +LexToken(CLOSEBRACKET,')',1,1441) +LexToken(SEMICOLON,';',1,1442) +LexToken(EOL,'\n',1,1443) +LexToken(IF,'if',1,1456) +LexToken(NOT,'~',1,1459) +LexToken(VAR,'or',1,1460) +LexToken(OPENBRACKET,'(',1,1462) +LexToken(VAR,'fun',1,1463) +LexToken(COMPARISON,'==',1,1467) +LexToken(DQSTRING,'"do_eval"',1,1478) +LexToken(CLOSEBRACKET,')',1,1479) +LexToken(THEN,'then',1,1481) +LexToken(EOL,'\n',1,1501) +LexToken(OPENSQBRACKET,'[',1,1518) +LexToken(VAR,'ok',1,1519) +LexToken(COMMA,',',1,1521) +LexToken(VAR,'a_domaine',1,1522) +LexToken(COMMA,',',1,1531) +LexToken(VAR,'b_domaine',1,1532) +LexToken(COMMA,',',1,1541) +LexToken(VAR,'discr',1,1542) +LexToken(COMMA,',',1,1547) +LexToken(VAR,'signe',1,1548) +LexToken(COMMA,',',1,1553) +LexToken(VAR,'choix',1,1554) +LexToken(COMMA,',',1,1559) +LexToken(VAR,'type_meth',1,1560) +LexToken(COMMA,',',1,1569) +LexToken(VAR,'degre',1,1570) +LexToken(COMMA,',',1,1575) +LexToken(VAR,'Nbr_maillage',1,1576) +LexToken(COMMA,',',1,1588) +LexToken(VAR,'CI',1,1608) +LexToken(COMMA,',',1,1610) +LexToken(VAR,'CI1',1,1611) +LexToken(COMMA,',',1,1614) +LexToken(VAR,'CLa_type',1,1615) +LexToken(COMMA,',',1,1623) +LexToken(VAR,'CLa_exp',1,1624) +LexToken(COMMA,',',1,1631) +LexToken(VAR,'CLb_type',1,1632) +LexToken(COMMA,',',1,1640) +LexToken(VAR,'CLb_exp',1,1641) +LexToken(COMMA,',',1,1648) +LexToken(VAR,'oper',1,1649) +LexToken(COMMA,',',1,1653) +LexToken(VAR,'a1',1,1654) +LexToken(COMMA,',',1,1656) +LexToken(VAR,'b1',1,1657) +LexToken(COMMA,',',1,1659) +LexToken(VAR,'a2',1,1660) +LexToken(COMMA,',',1,1662) +LexToken(VAR,'b2',1,1663) +LexToken(COMMA,',',1,1665) +LexToken(VAR,'a3',1,1666) +LexToken(COMMA,',',1,1668) +LexToken(VAR,'b3',1,1669) +LexToken(COMMA,',',1,1671) +LexToken(VAR,'a4',1,1672) +LexToken(COMMA,',',1,1674) +LexToken(VAR,'b4',1,1675) +LexToken(COMMA,',',1,1677) +LexToken(VAR,'a5',1,1678) +LexToken(COMMA,',',1,1680) +LexToken(VAR,'b5',1,1681) +LexToken(COMMA,',',1,1683) +LexToken(VAR,'a6',1,1703) +LexToken(COMMA,',',1,1705) +LexToken(VAR,'b6',1,1706) +LexToken(COMMA,',',1,1708) +LexToken(VAR,'a7',1,1709) +LexToken(COMMA,',',1,1711) +LexToken(VAR,'b7',1,1712) LexToken(COMMA,',',1,1714) -LexToken(VAR,'mesures',1,1715) -LexToken(COMMA,',',1,1722) -LexToken(VAR,'params_pde',1,1723) -LexToken(CLOSESQBRACKET,']',1,1733) -LexToken(ASSIGNMENT,'=',1,1734) -LexToken(VAR,'IHM_EDP',1,1735) -LexToken(OPENBRACKET,'(',1,1742) -LexToken(VAR,'params_pde',1,1743) -LexToken(CLOSEBRACKET,')',1,1753) -LexToken(SEMICOLON,';',1,1754) -LexToken(EOL,'\n',1,1755) -LexToken(IF,'if',1,1772) -LexToken(VAR,'ok',1,1775) -LexToken(THEN,'then',1,1778) -LexToken(EOL,'\n',1,1782) -LexToken(RETURN,'return',1,1803) -LexToken(SEMICOLON,';',1,1809) -LexToken(EOL,'\n',1,1810) -LexToken(END,'end',1,1827) -LexToken(EOL,'\n',1,1830) -LexToken(ELSE,'else',1,1843) -LexToken(EOL,'\n',1,1847) -LexToken(IF,'if',1,1864) -LexToken(VAR,'exists',1,1867) -LexToken(OPENBRACKET,'(',1,1873) -LexToken(DQSTRING,'"%scicos_context"',1,1890) -LexToken(CLOSEBRACKET,')',1,1891) -LexToken(THEN,'then',1,1893) -LexToken(EOL,'\n',1,1897) -LexToken(EOL,'\n',1,1942) -LexToken(OPENSQBRACKET,'[',1,1963) -LexToken(VAR,'ok',1,1964) -LexToken(COMMA,',',1,1966) -LexToken(VAR,'a_domaine',1,1967) -LexToken(COMMA,',',1,1976) -LexToken(VAR,'b_domaine',1,1977) -LexToken(COMMA,',',1,1986) -LexToken(VAR,'discr',1,1987) -LexToken(COMMA,',',1,1992) -LexToken(VAR,'signe',1,1993) -LexToken(COMMA,',',1,1998) -LexToken(VAR,'choix',1,1999) -LexToken(COMMA,',',1,2004) -LexToken(VAR,'type_meth',1,2005) -LexToken(COMMA,',',1,2014) -LexToken(VAR,'degre',1,2015) -LexToken(COMMA,',',1,2020) -LexToken(VAR,'Nbr_maillage',1,2021) -LexToken(COMMA,',',1,2033) -LexToken(VAR,'CI',1,2057) -LexToken(COMMA,',',1,2059) -LexToken(VAR,'CI1',1,2060) -LexToken(COMMA,',',1,2063) -LexToken(VAR,'CLa_type',1,2064) -LexToken(COMMA,',',1,2072) -LexToken(VAR,'CLa_exp',1,2073) -LexToken(COMMA,',',1,2080) -LexToken(VAR,'CLb_type',1,2081) -LexToken(COMMA,',',1,2089) -LexToken(VAR,'CLb_exp',1,2090) -LexToken(COMMA,',',1,2097) -LexToken(VAR,'oper',1,2098) -LexToken(COMMA,',',1,2102) -LexToken(VAR,'a1',1,2103) -LexToken(COMMA,',',1,2105) -LexToken(VAR,'b1',1,2106) -LexToken(COMMA,',',1,2108) -LexToken(VAR,'a2',1,2109) -LexToken(COMMA,',',1,2111) -LexToken(VAR,'b2',1,2112) -LexToken(COMMA,',',1,2114) -LexToken(VAR,'a3',1,2115) -LexToken(COMMA,',',1,2117) -LexToken(VAR,'b3',1,2118) -LexToken(COMMA,',',1,2120) -LexToken(VAR,'a4',1,2121) -LexToken(COMMA,',',1,2123) -LexToken(VAR,'b4',1,2124) -LexToken(COMMA,',',1,2126) -LexToken(VAR,'a5',1,2127) -LexToken(COMMA,',',1,2129) -LexToken(VAR,'b5',1,2130) -LexToken(COMMA,',',1,2132) -LexToken(VAR,'a6',1,2156) -LexToken(COMMA,',',1,2158) -LexToken(VAR,'b6',1,2159) -LexToken(COMMA,',',1,2161) -LexToken(VAR,'a7',1,2162) -LexToken(COMMA,',',1,2164) -LexToken(VAR,'b7',1,2165) -LexToken(COMMA,',',1,2167) -LexToken(VAR,'k',1,2168) +LexToken(VAR,'k',1,1715) +LexToken(COMMA,',',1,1716) +LexToken(VAR,'mesures',1,1717) +LexToken(COMMA,',',1,1724) +LexToken(VAR,'params_pde',1,1725) +LexToken(CLOSESQBRACKET,']',1,1735) +LexToken(ASSIGNMENT,'=',1,1736) +LexToken(VAR,'IHM_EDP',1,1737) +LexToken(OPENBRACKET,'(',1,1744) +LexToken(VAR,'params_pde',1,1745) +LexToken(CLOSEBRACKET,')',1,1755) +LexToken(SEMICOLON,';',1,1756) +LexToken(EOL,'\n',1,1757) +LexToken(IF,'if',1,1774) +LexToken(VAR,'ok',1,1777) +LexToken(THEN,'then',1,1780) +LexToken(EOL,'\n',1,1784) +LexToken(RETURN,'return',1,1805) +LexToken(SEMICOLON,';',1,1811) +LexToken(EOL,'\n',1,1812) +LexToken(END,'end',1,1829) +LexToken(EOL,'\n',1,1832) +LexToken(ELSE,'else',1,1845) +LexToken(EOL,'\n',1,1849) +LexToken(IF,'if',1,1866) +LexToken(VAR,'exists',1,1869) +LexToken(OPENBRACKET,'(',1,1875) +LexToken(DQSTRING,'"%scicos_context"',1,1892) +LexToken(CLOSEBRACKET,')',1,1893) +LexToken(THEN,'then',1,1895) +LexToken(EOL,'\n',1,1899) +LexToken(EOL,'\n',1,1944) +LexToken(OPENSQBRACKET,'[',1,1965) +LexToken(VAR,'ok',1,1966) +LexToken(COMMA,',',1,1968) +LexToken(VAR,'a_domaine',1,1969) +LexToken(COMMA,',',1,1978) +LexToken(VAR,'b_domaine',1,1979) +LexToken(COMMA,',',1,1988) +LexToken(VAR,'discr',1,1989) +LexToken(COMMA,',',1,1994) +LexToken(VAR,'signe',1,1995) +LexToken(COMMA,',',1,2000) +LexToken(VAR,'choix',1,2001) +LexToken(COMMA,',',1,2006) +LexToken(VAR,'type_meth',1,2007) +LexToken(COMMA,',',1,2016) +LexToken(VAR,'degre',1,2017) +LexToken(COMMA,',',1,2022) +LexToken(VAR,'Nbr_maillage',1,2023) +LexToken(COMMA,',',1,2035) +LexToken(VAR,'CI',1,2059) +LexToken(COMMA,',',1,2061) +LexToken(VAR,'CI1',1,2062) +LexToken(COMMA,',',1,2065) +LexToken(VAR,'CLa_type',1,2066) +LexToken(COMMA,',',1,2074) +LexToken(VAR,'CLa_exp',1,2075) +LexToken(COMMA,',',1,2082) +LexToken(VAR,'CLb_type',1,2083) +LexToken(COMMA,',',1,2091) +LexToken(VAR,'CLb_exp',1,2092) +LexToken(COMMA,',',1,2099) +LexToken(VAR,'oper',1,2100) +LexToken(COMMA,',',1,2104) +LexToken(VAR,'a1',1,2105) +LexToken(COMMA,',',1,2107) +LexToken(VAR,'b1',1,2108) +LexToken(COMMA,',',1,2110) +LexToken(VAR,'a2',1,2111) +LexToken(COMMA,',',1,2113) +LexToken(VAR,'b2',1,2114) +LexToken(COMMA,',',1,2116) +LexToken(VAR,'a3',1,2117) +LexToken(COMMA,',',1,2119) +LexToken(VAR,'b3',1,2120) +LexToken(COMMA,',',1,2122) +LexToken(VAR,'a4',1,2123) +LexToken(COMMA,',',1,2125) +LexToken(VAR,'b4',1,2126) +LexToken(COMMA,',',1,2128) +LexToken(VAR,'a5',1,2129) +LexToken(COMMA,',',1,2131) +LexToken(VAR,'b5',1,2132) +LexToken(COMMA,',',1,2134) +LexToken(VAR,'a6',1,2158) +LexToken(COMMA,',',1,2160) +LexToken(VAR,'b6',1,2161) +LexToken(COMMA,',',1,2163) +LexToken(VAR,'a7',1,2164) +LexToken(COMMA,',',1,2166) +LexToken(VAR,'b7',1,2167) LexToken(COMMA,',',1,2169) -LexToken(VAR,'mesures',1,2170) -LexToken(COMMA,',',1,2177) -LexToken(VAR,'params_pde',1,2178) -LexToken(CLOSESQBRACKET,']',1,2188) -LexToken(ASSIGNMENT,'=',1,2189) -LexToken(VAR,'setvalue_IHM_EDP',1,2190) -LexToken(OPENBRACKET,'(',1,2206) -LexToken(VAR,'params_pde',1,2207) -LexToken(CLOSEBRACKET,')',1,2217) -LexToken(SEMICOLON,';',1,2218) -LexToken(EOL,'\n',1,2219) -LexToken(END,'end',1,2236) -LexToken(EOL,'\n',1,2239) -LexToken(END,'end',1,2252) -LexToken(EOL,'\n',1,2255) -LexToken(EOL,'\n',1,2256) -LexToken(EOL,'\n',1,2305) -LexToken(EOL,'\n',1,2345) -LexToken(EOL,'\n',1,2395) -LexToken(VAR,'okk',1,2408) -LexToken(ASSIGNMENT,'=',1,2411) -LexToken(PREVAR_BOOLEAN,'%f',1,2412) -LexToken(SEMICOLON,';',1,2414) -LexToken(EOL,'\n',1,2415) -LexToken(VAR,'rdnom',1,2428) -LexToken(ASSIGNMENT,'=',1,2433) -LexToken(DQSTRING,'"PDE"',1,2438) -LexToken(SEMICOLON,';',1,2439) -LexToken(EOL,'\n',1,2440) -LexToken(VAR,'ok1',1,2453) -LexToken(ASSIGNMENT,'=',1,2456) -LexToken(PREVAR_BOOLEAN,'%t',1,2457) -LexToken(SEMICOLON,';',1,2459) -LexToken(EOL,'\n',1,2460) -LexToken(WHILE,'while',1,2473) -LexToken(PREVAR_BOOLEAN,'%t',1,2479) -LexToken(DO,'do',1,2482) -LexToken(EOL,'\n',1,2484) -LexToken(OPENSQBRACKET,'[',1,2501) -LexToken(VAR,'okk',1,2502) -LexToken(COMMA,',',1,2505) -LexToken(VAR,'rdnom',1,2506) -LexToken(COMMA,',',1,2511) -LexToken(VAR,'lab',1,2512) -LexToken(CLOSESQBRACKET,']',1,2515) -LexToken(ASSIGNMENT,'=',1,2516) -LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,2517) -LexToken(OPENBRACKET,'(',1,2532) -LexToken(DQSTRING,'"PLEASE, GIVE US THE BLOCK\\\'s NAME. "',1,2569) -LexToken(COMMA,',',1,2570) -LexToken(DQSTRING,'"New block\\\'s name :"',1,2610) -LexToken(COMMA,',',1,2611) -LexToken(VAR,'list',1,2612) -LexToken(OPENBRACKET,'(',1,2616) -LexToken(DQSTRING,'"str"',1,2621) -LexToken(COMMA,',',1,2622) -LexToken(NUMBER,'1',1,2623) -LexToken(CLOSEBRACKET,')',1,2624) -LexToken(COMMA,',',1,2625) -LexToken(VAR,'label',1,2626) -LexToken(OPENBRACKET,'(',1,2631) -LexToken(NUMBER,'3',1,2632) -LexToken(CLOSEBRACKET,')',1,2633) -LexToken(CLOSEBRACKET,')',1,2634) -LexToken(SEMICOLON,';',1,2635) -LexToken(EOL,'\n',1,2636) -LexToken(EOL,'\n',1,2637) -LexToken(IF,'if',1,2654) -LexToken(VAR,'okk',1,2657) -LexToken(COMPARISON,'==',1,2660) -LexToken(PREVAR_BOOLEAN,'%f',1,2662) -LexToken(THEN,'then',1,2665) -LexToken(EOL,'\n',1,2669) -LexToken(VAR,'ok1',1,2690) -LexToken(ASSIGNMENT,'=',1,2693) -LexToken(PREVAR_BOOLEAN,'%f',1,2694) -LexToken(SEMICOLON,';',1,2696) -LexToken(EOL,'\n',1,2697) -LexToken(RETURN,'return',1,2718) -LexToken(SEMICOLON,';',1,2724) -LexToken(EOL,'\n',1,2725) -LexToken(END,'end',1,2742) -LexToken(EOL,'\n',1,2745) -LexToken(VAR,'label',1,2762) -LexToken(OPENBRACKET,'(',1,2767) -LexToken(NUMBER,'3',1,2768) -LexToken(CLOSEBRACKET,')',1,2769) -LexToken(ASSIGNMENT,'=',1,2770) -LexToken(VAR,'lab',1,2771) -LexToken(SEMICOLON,';',1,2774) -LexToken(EOL,'\n',1,2775) -LexToken(VAR,'rdnom',1,2792) -LexToken(ASSIGNMENT,'=',1,2797) -LexToken(VAR,'stripblanks',1,2798) -LexToken(OPENBRACKET,'(',1,2809) -LexToken(VAR,'rdnom',1,2810) -LexToken(CLOSEBRACKET,')',1,2815) -LexToken(SEMICOLON,';',1,2816) -LexToken(EOL,'\n',1,2817) -LexToken(IF,'if',1,2834) -LexToken(VAR,'rdnom',1,2837) -LexToken(COMPARISON,'==',1,2842) -LexToken(VAR,'emptystr',1,2844) -LexToken(OPENBRACKET,'(',1,2852) -LexToken(CLOSEBRACKET,')',1,2853) -LexToken(THEN,'then',1,2855) -LexToken(EOL,'\n',1,2859) -LexToken(VAR,'ok1',1,2880) -LexToken(ASSIGNMENT,'=',1,2883) -LexToken(PREVAR_BOOLEAN,'%f',1,2884) -LexToken(SEMICOLON,';',1,2886) -LexToken(VAR,'x_message',1,2887) -LexToken(OPENBRACKET,'(',1,2896) -LexToken(DQSTRING,'"sorry C file name not defined"',1,2927) -LexToken(CLOSEBRACKET,')',1,2928) -LexToken(SEMICOLON,';',1,2929) -LexToken(EOL,'\n',1,2930) -LexToken(END,'end',1,2947) -LexToken(EOL,'\n',1,2950) -LexToken(IF,'if',1,2967) -LexToken(VAR,'ok1',1,2970) -LexToken(THEN,'then',1,2974) -LexToken(EOL,'\n',1,2978) -LexToken(BREAK,'break',1,2999) -LexToken(COMMA,',',1,3004) -LexToken(EOL,'\n',1,3005) -LexToken(END,'end',1,3022) -LexToken(EOL,'\n',1,3025) -LexToken(END,'end',1,3038) -LexToken(EOL,'\n',1,3041) -LexToken(EOL,'\n',1,3042) -LexToken(EOL,'\n',1,3075) -LexToken(IF,'if',1,3088) -LexToken(OPENBRACKET,'(',1,3091) -LexToken(VAR,'choix',1,3092) -LexToken(COMPARISON,'==',1,3098) -LexToken(NUMBER,'0',1,3101) -LexToken(CLOSEBRACKET,')',1,3102) -LexToken(THEN,'then',1,3104) -LexToken(EOL,'\n',1,3108) -LexToken(EOL,'\n',1,3145) -LexToken(VAR,'ind4',1,3162) -LexToken(ASSIGNMENT,'=',1,3166) -LexToken(VAR,'strindex',1,3167) -LexToken(OPENBRACKET,'(',1,3175) -LexToken(VAR,'a4',1,3176) -LexToken(COMMA,',',1,3178) -LexToken(DQSTRING,'"x"',1,3181) -LexToken(CLOSEBRACKET,')',1,3182) -LexToken(SEMICOLON,';',1,3183) -LexToken(EOL,'\n',1,3184) -LexToken(VAR,'ind1',1,3201) -LexToken(ASSIGNMENT,'=',1,3205) -LexToken(VAR,'strindex',1,3206) -LexToken(OPENBRACKET,'(',1,3214) -LexToken(VAR,'a1',1,3215) -LexToken(COMMA,',',1,3217) -LexToken(DQSTRING,'"x"',1,3220) -LexToken(CLOSEBRACKET,')',1,3221) -LexToken(SEMICOLON,';',1,3222) -LexToken(EOL,'\n',1,3223) -LexToken(VAR,'ind2',1,3240) -LexToken(ASSIGNMENT,'=',1,3244) -LexToken(VAR,'strindex',1,3245) -LexToken(OPENBRACKET,'(',1,3253) -LexToken(VAR,'a2',1,3254) -LexToken(COMMA,',',1,3256) -LexToken(DQSTRING,'"x"',1,3259) -LexToken(CLOSEBRACKET,')',1,3260) -LexToken(SEMICOLON,';',1,3261) -LexToken(EOL,'\n',1,3262) -LexToken(IF,'if',1,3279) -LexToken(OPENBRACKET,'(',1,3282) -LexToken(VAR,'ind4',1,3283) -LexToken(COMPARISON,'~=',1,3287) -LexToken(OPENSQBRACKET,'[',1,3289) -LexToken(CLOSESQBRACKET,']',1,3290) -LexToken(LOGICAL,'|',1,3292) -LexToken(VAR,'ind1',1,3294) -LexToken(COMPARISON,'~=',1,3298) -LexToken(OPENSQBRACKET,'[',1,3300) -LexToken(CLOSESQBRACKET,']',1,3301) -LexToken(LOGICAL,'|',1,3303) -LexToken(VAR,'ind2',1,3305) -LexToken(COMPARISON,'~=',1,3309) -LexToken(OPENSQBRACKET,'[',1,3311) -LexToken(CLOSESQBRACKET,']',1,3312) -LexToken(CLOSEBRACKET,')',1,3313) -LexToken(THEN,'then',1,3315) -LexToken(EOL,'\n',1,3319) -LexToken(IF,'if',1,3340) -LexToken(OPENBRACKET,'(',1,3343) -LexToken(VAR,'signe',1,3344) -LexToken(COMPARISON,'==',1,3350) -LexToken(NUMBER,'1',1,3353) -LexToken(CLOSEBRACKET,')',1,3354) -LexToken(THEN,'then',1,3356) -LexToken(COMMA,',',1,3360) -LexToken(EOL,'\n',1,3361) -LexToken(VAR,'delta',1,3386) -LexToken(ASSIGNMENT,'=',1,3391) -LexToken(NUMBER,'1',1,3392) -LexToken(SEMICOLON,';',1,3393) -LexToken(EOL,'\n',1,3394) -LexToken(ELSEIF,'elseif',1,3415) -LexToken(OPENBRACKET,'(',1,3422) -LexToken(VAR,'signe',1,3423) -LexToken(COMPARISON,'==',1,3429) -LexToken(NUMBER,'2',1,3432) -LexToken(CLOSEBRACKET,')',1,3433) -LexToken(THEN,'then',1,3435) -LexToken(COMMA,',',1,3439) -LexToken(EOL,'\n',1,3440) -LexToken(VAR,'delta',1,3465) -LexToken(ASSIGNMENT,'=',1,3470) -LexToken(NUMBER,'-1',1,3471) -LexToken(SEMICOLON,';',1,3473) -LexToken(EOL,'\n',1,3474) -LexToken(ELSEIF,'elseif',1,3495) -LexToken(OPENBRACKET,'(',1,3502) -LexToken(VAR,'signe',1,3503) -LexToken(COMPARISON,'==',1,3509) -LexToken(NUMBER,'0',1,3512) -LexToken(CLOSEBRACKET,')',1,3513) -LexToken(THEN,'then',1,3515) -LexToken(COMMA,',',1,3519) -LexToken(EOL,'\n',1,3520) -LexToken(VAR,'delta',1,3545) -LexToken(ASSIGNMENT,'=',1,3550) -LexToken(NUMBER,'0',1,3551) -LexToken(SEMICOLON,';',1,3552) -LexToken(EOL,'\n',1,3553) -LexToken(ELSE,'else',1,3574) -LexToken(EOL,'\n',1,3578) -LexToken(VAR,'x_message',1,3603) -LexToken(OPENBRACKET,'(',1,3612) -LexToken(OPENSQBRACKET,'[',1,3613) -LexToken(DQSTRING,'"le discriminant n\\\'est pas constant,"',1,3651) -LexToken(SEMICOLON,';',1,3652) -LexToken(DQSTRING,'"Vous devez choisir son signe dans l\\\'IHM"',1,3695) -LexToken(CLOSESQBRACKET,']',1,3696) -LexToken(CLOSEBRACKET,')',1,3697) -LexToken(SEMICOLON,';',1,3698) -LexToken(EOL,'\n',1,3699) -LexToken(RETURN,'return',1,3724) -LexToken(SEMICOLON,';',1,3730) -LexToken(EOL,'\n',1,3731) -LexToken(END,'end',1,3752) -LexToken(EOL,'\n',1,3755) -LexToken(ELSE,'else',1,3772) -LexToken(EOL,'\n',1,3776) -LexToken(VAR,'delta',1,3797) -LexToken(ASSIGNMENT,'=',1,3802) -LexToken(VAR,'evstr',1,3803) -LexToken(OPENBRACKET,'(',1,3808) -LexToken(VAR,'a4',1,3809) -LexToken(CLOSEBRACKET,')',1,3811) -LexToken(OPERATOR,'^',1,3812) -LexToken(NUMBER,'2',1,3813) -LexToken(NUMBER,'-4',1,3814) -LexToken(OPERATOR,'*',1,3816) -LexToken(VAR,'evstr',1,3817) -LexToken(OPENBRACKET,'(',1,3822) -LexToken(VAR,'a1',1,3823) -LexToken(CLOSEBRACKET,')',1,3825) -LexToken(OPERATOR,'*',1,3826) -LexToken(VAR,'evstr',1,3827) -LexToken(OPENBRACKET,'(',1,3832) -LexToken(VAR,'a2',1,3833) -LexToken(CLOSEBRACKET,')',1,3835) -LexToken(SEMICOLON,';',1,3836) -LexToken(EOL,'\n',1,3837) -LexToken(END,'end',1,3854) -LexToken(EOL,'\n',1,3857) -LexToken(IF,'if',1,3874) -LexToken(OPENBRACKET,'(',1,3877) -LexToken(VAR,'delta',1,3878) -LexToken(COMPARISON,'==',1,3883) -LexToken(OPENSQBRACKET,'[',1,3885) -LexToken(CLOSESQBRACKET,']',1,3886) -LexToken(CLOSEBRACKET,')',1,3887) -LexToken(THEN,'then',1,3889) -LexToken(COMMA,',',1,3893) -LexToken(EOL,'\n',1,3894) -LexToken(VAR,'delta',1,3915) -LexToken(ASSIGNMENT,'=',1,3920) -LexToken(NUMBER,'0',1,3921) -LexToken(SEMICOLON,';',1,3922) -LexToken(EOL,'\n',1,3923) -LexToken(END,'end',1,3940) -LexToken(EOL,'\n',1,3943) -LexToken(VAR,'type_meth',1,3960) -LexToken(ASSIGNMENT,'=',1,3969) -LexToken(VAR,'arbre_decision',1,3970) -LexToken(OPENBRACKET,'(',1,3984) -LexToken(VAR,'delta',1,3985) -LexToken(CLOSEBRACKET,')',1,3990) -LexToken(SEMICOLON,';',1,3991) -LexToken(EOL,'\n',1,3992) -LexToken(END,'end',1,4005) -LexToken(EOL,'\n',1,4008) -LexToken(EOL,'\n',1,4091) -LexToken(EOL,'\n',1,4117) -LexToken(OPENSQBRACKET,'[',1,4130) -LexToken(VAR,'flag_type',1,4131) -LexToken(COMMA,',',1,4140) -LexToken(VAR,'rdnom',1,4141) -LexToken(COMMA,',',1,4146) -LexToken(VAR,'DF_type',1,4147) -LexToken(COMMA,',',1,4154) -LexToken(VAR,'tt',1,4155) -LexToken(CLOSESQBRACKET,']',1,4157) -LexToken(ASSIGNMENT,'=',1,4158) -LexToken(VAR,'translate',1,4159) -LexToken(OPENBRACKET,'(',1,4168) -LexToken(VAR,'CI',1,4169) -LexToken(COMMA,',',1,4171) -LexToken(VAR,'CI1',1,4172) -LexToken(COMMA,',',1,4175) -LexToken(VAR,'CLa_type',1,4176) -LexToken(COMMA,',',1,4184) -LexToken(VAR,'CLa_exp',1,4185) -LexToken(COMMA,',',1,4192) -LexToken(VAR,'CLb_type',1,4193) -LexToken(COMMA,',',1,4201) -LexToken(VAR,'CLb_exp',1,4202) -LexToken(COMMA,',',1,4209) -LexToken(VAR,'oper',1,4210) -LexToken(COMMA,',',1,4214) -LexToken(VAR,'type_meth',1,4215) -LexToken(COMMA,',',1,4224) -LexToken(VAR,'degre',1,4225) -LexToken(COMMA,',',1,4230) -LexToken(VAR,'a_domaine',1,4231) -LexToken(COMMA,',',1,4240) -LexToken(VAR,'b_domaine',1,4256) -LexToken(COMMA,',',1,4265) -LexToken(VAR,'Nbr_maillage',1,4266) -LexToken(COMMA,',',1,4278) -LexToken(VAR,'a1',1,4279) +LexToken(VAR,'k',1,2170) +LexToken(COMMA,',',1,2171) +LexToken(VAR,'mesures',1,2172) +LexToken(COMMA,',',1,2179) +LexToken(VAR,'params_pde',1,2180) +LexToken(CLOSESQBRACKET,']',1,2190) +LexToken(ASSIGNMENT,'=',1,2191) +LexToken(VAR,'setvalue_IHM_EDP',1,2192) +LexToken(OPENBRACKET,'(',1,2208) +LexToken(VAR,'params_pde',1,2209) +LexToken(CLOSEBRACKET,')',1,2219) +LexToken(SEMICOLON,';',1,2220) +LexToken(EOL,'\n',1,2221) +LexToken(END,'end',1,2238) +LexToken(EOL,'\n',1,2241) +LexToken(END,'end',1,2254) +LexToken(EOL,'\n',1,2257) +LexToken(EOL,'\n',1,2258) +LexToken(EOL,'\n',1,2307) +LexToken(EOL,'\n',1,2347) +LexToken(EOL,'\n',1,2397) +LexToken(VAR,'okk',1,2410) +LexToken(ASSIGNMENT,'=',1,2413) +LexToken(PREVAR_BOOLEAN,'%f',1,2414) +LexToken(SEMICOLON,';',1,2416) +LexToken(EOL,'\n',1,2417) +LexToken(VAR,'rdnom',1,2430) +LexToken(ASSIGNMENT,'=',1,2435) +LexToken(DQSTRING,'"PDE"',1,2440) +LexToken(SEMICOLON,';',1,2441) +LexToken(EOL,'\n',1,2442) +LexToken(VAR,'ok1',1,2455) +LexToken(ASSIGNMENT,'=',1,2458) +LexToken(PREVAR_BOOLEAN,'%t',1,2459) +LexToken(SEMICOLON,';',1,2461) +LexToken(EOL,'\n',1,2462) +LexToken(WHILE,'while',1,2475) +LexToken(PREVAR_BOOLEAN,'%t',1,2481) +LexToken(DO,'do',1,2484) +LexToken(EOL,'\n',1,2486) +LexToken(OPENSQBRACKET,'[',1,2503) +LexToken(VAR,'okk',1,2504) +LexToken(COMMA,',',1,2507) +LexToken(VAR,'rdnom',1,2508) +LexToken(COMMA,',',1,2513) +LexToken(VAR,'lab',1,2514) +LexToken(CLOSESQBRACKET,']',1,2517) +LexToken(ASSIGNMENT,'=',1,2518) +LexToken(SCICOS_GETVALUE,'scicos_getvalue',1,2519) +LexToken(OPENBRACKET,'(',1,2534) +LexToken(DQSTRING,'"PLEASE, GIVE US THE BLOCK\\\'s NAME. "',1,2571) +LexToken(COMMA,',',1,2572) +LexToken(DQSTRING,'"New block\\\'s name :"',1,2612) +LexToken(COMMA,',',1,2613) +LexToken(VAR,'list',1,2614) +LexToken(OPENBRACKET,'(',1,2618) +LexToken(DQSTRING,'"str"',1,2623) +LexToken(COMMA,',',1,2624) +LexToken(NUMBER,'1',1,2625) +LexToken(CLOSEBRACKET,')',1,2626) +LexToken(COMMA,',',1,2627) +LexToken(VAR,'label',1,2628) +LexToken(OPENBRACKET,'(',1,2633) +LexToken(NUMBER,'3',1,2634) +LexToken(CLOSEBRACKET,')',1,2635) +LexToken(CLOSEBRACKET,')',1,2636) +LexToken(SEMICOLON,';',1,2637) +LexToken(EOL,'\n',1,2638) +LexToken(EOL,'\n',1,2639) +LexToken(IF,'if',1,2656) +LexToken(VAR,'okk',1,2659) +LexToken(COMPARISON,'==',1,2662) +LexToken(PREVAR_BOOLEAN,'%f',1,2664) +LexToken(THEN,'then',1,2667) +LexToken(EOL,'\n',1,2671) +LexToken(VAR,'ok1',1,2692) +LexToken(ASSIGNMENT,'=',1,2695) +LexToken(PREVAR_BOOLEAN,'%f',1,2696) +LexToken(SEMICOLON,';',1,2698) +LexToken(EOL,'\n',1,2699) +LexToken(RETURN,'return',1,2720) +LexToken(SEMICOLON,';',1,2726) +LexToken(EOL,'\n',1,2727) +LexToken(END,'end',1,2744) +LexToken(EOL,'\n',1,2747) +LexToken(VAR,'label',1,2764) +LexToken(OPENBRACKET,'(',1,2769) +LexToken(NUMBER,'3',1,2770) +LexToken(CLOSEBRACKET,')',1,2771) +LexToken(ASSIGNMENT,'=',1,2772) +LexToken(VAR,'lab',1,2773) +LexToken(SEMICOLON,';',1,2776) +LexToken(EOL,'\n',1,2777) +LexToken(VAR,'rdnom',1,2794) +LexToken(ASSIGNMENT,'=',1,2799) +LexToken(VAR,'stripblanks',1,2800) +LexToken(OPENBRACKET,'(',1,2811) +LexToken(VAR,'rdnom',1,2812) +LexToken(CLOSEBRACKET,')',1,2817) +LexToken(SEMICOLON,';',1,2818) +LexToken(EOL,'\n',1,2819) +LexToken(IF,'if',1,2836) +LexToken(VAR,'rdnom',1,2839) +LexToken(COMPARISON,'==',1,2844) +LexToken(VAR,'emptystr',1,2846) +LexToken(OPENBRACKET,'(',1,2854) +LexToken(CLOSEBRACKET,')',1,2855) +LexToken(THEN,'then',1,2857) +LexToken(EOL,'\n',1,2861) +LexToken(VAR,'ok1',1,2882) +LexToken(ASSIGNMENT,'=',1,2885) +LexToken(PREVAR_BOOLEAN,'%f',1,2886) +LexToken(SEMICOLON,';',1,2888) +LexToken(VAR,'x_message',1,2889) +LexToken(OPENBRACKET,'(',1,2898) +LexToken(DQSTRING,'"sorry C file name not defined"',1,2929) +LexToken(CLOSEBRACKET,')',1,2930) +LexToken(SEMICOLON,';',1,2931) +LexToken(EOL,'\n',1,2932) +LexToken(END,'end',1,2949) +LexToken(EOL,'\n',1,2952) +LexToken(IF,'if',1,2969) +LexToken(VAR,'ok1',1,2972) +LexToken(THEN,'then',1,2976) +LexToken(EOL,'\n',1,2980) +LexToken(BREAK,'break',1,3001) +LexToken(COMMA,',',1,3006) +LexToken(EOL,'\n',1,3007) +LexToken(END,'end',1,3024) +LexToken(EOL,'\n',1,3027) +LexToken(END,'end',1,3040) +LexToken(EOL,'\n',1,3043) +LexToken(EOL,'\n',1,3044) +LexToken(EOL,'\n',1,3077) +LexToken(IF,'if',1,3090) +LexToken(OPENBRACKET,'(',1,3093) +LexToken(VAR,'choix',1,3094) +LexToken(COMPARISON,'==',1,3100) +LexToken(NUMBER,'0',1,3103) +LexToken(CLOSEBRACKET,')',1,3104) +LexToken(THEN,'then',1,3106) +LexToken(EOL,'\n',1,3110) +LexToken(EOL,'\n',1,3147) +LexToken(VAR,'ind4',1,3164) +LexToken(ASSIGNMENT,'=',1,3168) +LexToken(VAR,'strindex',1,3169) +LexToken(OPENBRACKET,'(',1,3177) +LexToken(VAR,'a4',1,3178) +LexToken(COMMA,',',1,3180) +LexToken(DQSTRING,'"x"',1,3183) +LexToken(CLOSEBRACKET,')',1,3184) +LexToken(SEMICOLON,';',1,3185) +LexToken(EOL,'\n',1,3186) +LexToken(VAR,'ind1',1,3203) +LexToken(ASSIGNMENT,'=',1,3207) +LexToken(VAR,'strindex',1,3208) +LexToken(OPENBRACKET,'(',1,3216) +LexToken(VAR,'a1',1,3217) +LexToken(COMMA,',',1,3219) +LexToken(DQSTRING,'"x"',1,3222) +LexToken(CLOSEBRACKET,')',1,3223) +LexToken(SEMICOLON,';',1,3224) +LexToken(EOL,'\n',1,3225) +LexToken(VAR,'ind2',1,3242) +LexToken(ASSIGNMENT,'=',1,3246) +LexToken(VAR,'strindex',1,3247) +LexToken(OPENBRACKET,'(',1,3255) +LexToken(VAR,'a2',1,3256) +LexToken(COMMA,',',1,3258) +LexToken(DQSTRING,'"x"',1,3261) +LexToken(CLOSEBRACKET,')',1,3262) +LexToken(SEMICOLON,';',1,3263) +LexToken(EOL,'\n',1,3264) +LexToken(IF,'if',1,3281) +LexToken(OPENBRACKET,'(',1,3284) +LexToken(VAR,'ind4',1,3285) +LexToken(COMPARISON,'~=',1,3289) +LexToken(OPENSQBRACKET,'[',1,3291) +LexToken(CLOSESQBRACKET,']',1,3292) +LexToken(LOGICAL,'|',1,3294) +LexToken(VAR,'ind1',1,3296) +LexToken(COMPARISON,'~=',1,3300) +LexToken(OPENSQBRACKET,'[',1,3302) +LexToken(CLOSESQBRACKET,']',1,3303) +LexToken(LOGICAL,'|',1,3305) +LexToken(VAR,'ind2',1,3307) +LexToken(COMPARISON,'~=',1,3311) +LexToken(OPENSQBRACKET,'[',1,3313) +LexToken(CLOSESQBRACKET,']',1,3314) +LexToken(CLOSEBRACKET,')',1,3315) +LexToken(THEN,'then',1,3317) +LexToken(EOL,'\n',1,3321) +LexToken(IF,'if',1,3342) +LexToken(OPENBRACKET,'(',1,3345) +LexToken(VAR,'signe',1,3346) +LexToken(COMPARISON,'==',1,3352) +LexToken(NUMBER,'1',1,3355) +LexToken(CLOSEBRACKET,')',1,3356) +LexToken(THEN,'then',1,3358) +LexToken(COMMA,',',1,3362) +LexToken(EOL,'\n',1,3363) +LexToken(VAR,'delta',1,3388) +LexToken(ASSIGNMENT,'=',1,3393) +LexToken(NUMBER,'1',1,3394) +LexToken(SEMICOLON,';',1,3395) +LexToken(EOL,'\n',1,3396) +LexToken(ELSEIF,'elseif',1,3417) +LexToken(OPENBRACKET,'(',1,3424) +LexToken(VAR,'signe',1,3425) +LexToken(COMPARISON,'==',1,3431) +LexToken(NUMBER,'2',1,3434) +LexToken(CLOSEBRACKET,')',1,3435) +LexToken(THEN,'then',1,3437) +LexToken(COMMA,',',1,3441) +LexToken(EOL,'\n',1,3442) +LexToken(VAR,'delta',1,3467) +LexToken(ASSIGNMENT,'=',1,3472) +LexToken(ADDITION,'-',1,3473) +LexToken(NUMBER,'1',1,3474) +LexToken(SEMICOLON,';',1,3475) +LexToken(EOL,'\n',1,3476) +LexToken(ELSEIF,'elseif',1,3497) +LexToken(OPENBRACKET,'(',1,3504) +LexToken(VAR,'signe',1,3505) +LexToken(COMPARISON,'==',1,3511) +LexToken(NUMBER,'0',1,3514) +LexToken(CLOSEBRACKET,')',1,3515) +LexToken(THEN,'then',1,3517) +LexToken(COMMA,',',1,3521) +LexToken(EOL,'\n',1,3522) +LexToken(VAR,'delta',1,3547) +LexToken(ASSIGNMENT,'=',1,3552) +LexToken(NUMBER,'0',1,3553) +LexToken(SEMICOLON,';',1,3554) +LexToken(EOL,'\n',1,3555) +LexToken(ELSE,'else',1,3576) +LexToken(EOL,'\n',1,3580) +LexToken(VAR,'x_message',1,3605) +LexToken(OPENBRACKET,'(',1,3614) +LexToken(OPENSQBRACKET,'[',1,3615) +LexToken(DQSTRING,'"le discriminant n\\\'est pas constant,"',1,3653) +LexToken(SEMICOLON,';',1,3654) +LexToken(DQSTRING,'"Vous devez choisir son signe dans l\\\'IHM"',1,3697) +LexToken(CLOSESQBRACKET,']',1,3698) +LexToken(CLOSEBRACKET,')',1,3699) +LexToken(SEMICOLON,';',1,3700) +LexToken(EOL,'\n',1,3701) +LexToken(RETURN,'return',1,3726) +LexToken(SEMICOLON,';',1,3732) +LexToken(EOL,'\n',1,3733) +LexToken(END,'end',1,3754) +LexToken(EOL,'\n',1,3757) +LexToken(ELSE,'else',1,3774) +LexToken(EOL,'\n',1,3778) +LexToken(VAR,'delta',1,3799) +LexToken(ASSIGNMENT,'=',1,3804) +LexToken(VAR,'evstr',1,3805) +LexToken(OPENBRACKET,'(',1,3810) +LexToken(VAR,'a4',1,3811) +LexToken(CLOSEBRACKET,')',1,3813) +LexToken(MULTIPLICATION,'^',1,3814) +LexToken(NUMBER,'2',1,3815) +LexToken(ADDITION,'-',1,3816) +LexToken(NUMBER,'4',1,3817) +LexToken(MULTIPLICATION,'*',1,3818) +LexToken(VAR,'evstr',1,3819) +LexToken(OPENBRACKET,'(',1,3824) +LexToken(VAR,'a1',1,3825) +LexToken(CLOSEBRACKET,')',1,3827) +LexToken(MULTIPLICATION,'*',1,3828) +LexToken(VAR,'evstr',1,3829) +LexToken(OPENBRACKET,'(',1,3834) +LexToken(VAR,'a2',1,3835) +LexToken(CLOSEBRACKET,')',1,3837) +LexToken(SEMICOLON,';',1,3838) +LexToken(EOL,'\n',1,3839) +LexToken(END,'end',1,3856) +LexToken(EOL,'\n',1,3859) +LexToken(IF,'if',1,3876) +LexToken(OPENBRACKET,'(',1,3879) +LexToken(VAR,'delta',1,3880) +LexToken(COMPARISON,'==',1,3885) +LexToken(OPENSQBRACKET,'[',1,3887) +LexToken(CLOSESQBRACKET,']',1,3888) +LexToken(CLOSEBRACKET,')',1,3889) +LexToken(THEN,'then',1,3891) +LexToken(COMMA,',',1,3895) +LexToken(EOL,'\n',1,3896) +LexToken(VAR,'delta',1,3917) +LexToken(ASSIGNMENT,'=',1,3922) +LexToken(NUMBER,'0',1,3923) +LexToken(SEMICOLON,';',1,3924) +LexToken(EOL,'\n',1,3925) +LexToken(END,'end',1,3942) +LexToken(EOL,'\n',1,3945) +LexToken(VAR,'type_meth',1,3962) +LexToken(ASSIGNMENT,'=',1,3971) +LexToken(VAR,'arbre_decision',1,3972) +LexToken(OPENBRACKET,'(',1,3986) +LexToken(VAR,'delta',1,3987) +LexToken(CLOSEBRACKET,')',1,3992) +LexToken(SEMICOLON,';',1,3993) +LexToken(EOL,'\n',1,3994) +LexToken(END,'end',1,4007) +LexToken(EOL,'\n',1,4010) +LexToken(EOL,'\n',1,4094) +LexToken(EOL,'\n',1,4120) +LexToken(OPENSQBRACKET,'[',1,4133) +LexToken(VAR,'flag_type',1,4134) +LexToken(COMMA,',',1,4143) +LexToken(VAR,'rdnom',1,4144) +LexToken(COMMA,',',1,4149) +LexToken(VAR,'DF_type',1,4150) +LexToken(COMMA,',',1,4157) +LexToken(VAR,'tt',1,4158) +LexToken(CLOSESQBRACKET,']',1,4160) +LexToken(ASSIGNMENT,'=',1,4161) +LexToken(VAR,'translate',1,4162) +LexToken(OPENBRACKET,'(',1,4171) +LexToken(VAR,'CI',1,4172) +LexToken(COMMA,',',1,4174) +LexToken(VAR,'CI1',1,4175) +LexToken(COMMA,',',1,4178) +LexToken(VAR,'CLa_type',1,4179) +LexToken(COMMA,',',1,4187) +LexToken(VAR,'CLa_exp',1,4188) +LexToken(COMMA,',',1,4195) +LexToken(VAR,'CLb_type',1,4196) +LexToken(COMMA,',',1,4204) +LexToken(VAR,'CLb_exp',1,4205) +LexToken(COMMA,',',1,4212) +LexToken(VAR,'oper',1,4213) +LexToken(COMMA,',',1,4217) +LexToken(VAR,'type_meth',1,4218) +LexToken(COMMA,',',1,4227) +LexToken(VAR,'degre',1,4228) +LexToken(COMMA,',',1,4233) +LexToken(VAR,'a_domaine',1,4234) +LexToken(COMMA,',',1,4243) +LexToken(VAR,'b_domaine',1,4259) +LexToken(COMMA,',',1,4268) +LexToken(VAR,'Nbr_maillage',1,4269) LexToken(COMMA,',',1,4281) -LexToken(VAR,'b1',1,4282) +LexToken(VAR,'a1',1,4282) LexToken(COMMA,',',1,4284) -LexToken(VAR,'a2',1,4285) +LexToken(VAR,'b1',1,4285) LexToken(COMMA,',',1,4287) -LexToken(VAR,'b2',1,4288) +LexToken(VAR,'a2',1,4288) LexToken(COMMA,',',1,4290) -LexToken(VAR,'a3',1,4291) +LexToken(VAR,'b2',1,4291) LexToken(COMMA,',',1,4293) -LexToken(VAR,'b3',1,4294) +LexToken(VAR,'a3',1,4294) LexToken(COMMA,',',1,4296) -LexToken(VAR,'a4',1,4297) +LexToken(VAR,'b3',1,4297) LexToken(COMMA,',',1,4299) -LexToken(VAR,'b4',1,4300) +LexToken(VAR,'a4',1,4300) LexToken(COMMA,',',1,4302) -LexToken(VAR,'a5',1,4303) +LexToken(VAR,'b4',1,4303) LexToken(COMMA,',',1,4305) -LexToken(VAR,'b5',1,4306) +LexToken(VAR,'a5',1,4306) LexToken(COMMA,',',1,4308) -LexToken(VAR,'a6',1,4309) +LexToken(VAR,'b5',1,4309) LexToken(COMMA,',',1,4311) -LexToken(VAR,'b6',1,4312) +LexToken(VAR,'a6',1,4312) LexToken(COMMA,',',1,4314) -LexToken(VAR,'a7',1,4315) +LexToken(VAR,'b6',1,4315) LexToken(COMMA,',',1,4317) -LexToken(VAR,'b7',1,4318) +LexToken(VAR,'a7',1,4318) LexToken(COMMA,',',1,4320) -LexToken(VAR,'rdnom',1,4321) -LexToken(COMMA,',',1,4326) -LexToken(VAR,'mesures',1,4327) -LexToken(CLOSEBRACKET,')',1,4334) -LexToken(SEMICOLON,';',1,4335) -LexToken(EOL,'\n',1,4336) -LexToken(EOL,'\n',1,4355) -LexToken(EOL,'\n',1,4385) -LexToken(EOL,'\n',1,4403) -LexToken(EOL,'\n',1,4404) -LexToken(EOL,'\n',1,4467) -LexToken(VAR,'Nbr',1,4480) -LexToken(ASSIGNMENT,'=',1,4483) -LexToken(VAR,'Nbr_maillage',1,4484) -LexToken(SEMICOLON,';',1,4496) -LexToken(EOL,'\n',1,4497) -LexToken(IF,'if',1,4510) -LexToken(OPENBRACKET,'(',1,4513) -LexToken(OPENBRACKET,'(',1,4514) -LexToken(VAR,'CLa_type',1,4515) -LexToken(COMPARISON,'==',1,4524) -LexToken(NUMBER,'1',1,4527) -LexToken(CLOSEBRACKET,')',1,4528) -LexToken(LOGICAL,'&',1,4530) -LexToken(OPENBRACKET,'(',1,4532) -LexToken(VAR,'DF_type',1,4533) -LexToken(COMPARISON,'==',1,4541) -LexToken(NUMBER,'0',1,4544) -LexToken(LOGICAL,'|',1,4546) -LexToken(VAR,'DF_type',1,4548) -LexToken(COMPARISON,'==',1,4556) -LexToken(NUMBER,'1',1,4559) -LexToken(CLOSEBRACKET,')',1,4560) -LexToken(CLOSEBRACKET,')',1,4561) -LexToken(LOGICAL,'|',1,4563) -LexToken(OPENBRACKET,'(',1,4565) -LexToken(OPENBRACKET,'(',1,4566) -LexToken(VAR,'CLb_type',1,4567) -LexToken(COMPARISON,'==',1,4576) -LexToken(NUMBER,'1',1,4579) -LexToken(CLOSEBRACKET,')',1,4580) -LexToken(LOGICAL,'&',1,4582) -LexToken(OPENBRACKET,'(',1,4584) -LexToken(VAR,'DF_type',1,4585) -LexToken(COMPARISON,'==',1,4593) -LexToken(NUMBER,'0',1,4596) -LexToken(LOGICAL,'|',1,4598) -LexToken(VAR,'DF_type',1,4600) -LexToken(COMPARISON,'==',1,4608) -LexToken(NUMBER,'2',1,4611) -LexToken(CLOSEBRACKET,')',1,4612) -LexToken(CLOSEBRACKET,')',1,4613) -LexToken(THEN,'then',1,4615) -LexToken(EOL,'\n',1,4619) -LexToken(VAR,'Nbr',1,4636) -LexToken(ASSIGNMENT,'=',1,4639) -LexToken(VAR,'Nbr',1,4640) -LexToken(OPERATOR,'+',1,4643) -LexToken(NUMBER,'1',1,4644) -LexToken(SEMICOLON,';',1,4645) -LexToken(EOL,'\n',1,4646) -LexToken(END,'end',1,4659) -LexToken(EOL,'\n',1,4662) -LexToken(EOL,'\n',1,4663) -LexToken(IF,'if',1,4676) -LexToken(OPENBRACKET,'(',1,4679) -LexToken(VAR,'mesures',1,4681) -LexToken(COMPARISON,'==',1,4689) -LexToken(OPENSQBRACKET,'[',1,4691) -LexToken(CLOSESQBRACKET,']',1,4692) -LexToken(CLOSEBRACKET,')',1,4693) -LexToken(THEN,'then',1,4695) -LexToken(EOL,'\n',1,4699) -LexToken(VAR,'out',1,4716) -LexToken(ASSIGNMENT,'=',1,4719) -LexToken(VAR,'Nbr_maillage',1,4720) -LexToken(SEMICOLON,';',1,4732) -LexToken(EOL,'\n',1,4733) -LexToken(ELSE,'else',1,4746) -LexToken(EOL,'\n',1,4750) -LexToken(VAR,'out',1,4767) -LexToken(ASSIGNMENT,'=',1,4770) -LexToken(OPENSQBRACKET,'[',1,4771) -LexToken(VAR,'Nbr_maillage',1,4772) -LexToken(SEMICOLON,';',1,4784) -LexToken(VAR,'size',1,4785) -LexToken(OPENBRACKET,'(',1,4789) -LexToken(VAR,'mesures',1,4790) -LexToken(COMMA,',',1,4797) -LexToken(DQSTRING,'"*"',1,4800) -LexToken(CLOSEBRACKET,')',1,4801) -LexToken(CLOSESQBRACKET,']',1,4802) -LexToken(SEMICOLON,';',1,4803) -LexToken(EOL,'\n',1,4804) -LexToken(END,'end',1,4817) -LexToken(EOL,'\n',1,4820) -LexToken(IF,'if',1,4833) -LexToken(OPENBRACKET,'(',1,4836) -LexToken(VAR,'flag_type',1,4837) -LexToken(COMPARISON,'==',1,4847) -LexToken(NUMBER,'1',1,4850) -LexToken(CLOSEBRACKET,')',1,4851) -LexToken(THEN,'then',1,4853) -LexToken(EOL,'\n',1,4857) -LexToken(EOL,'\n',1,4886) -LexToken(VAR,'model',1,4903) -LexToken(DOT,'.',1,4908) -LexToken(VAR,'sim',1,4909) -LexToken(ASSIGNMENT,'=',1,4912) -LexToken(VAR,'list',1,4913) -LexToken(OPENBRACKET,'(',1,4917) -LexToken(VAR,'rdnom',1,4918) -LexToken(COMMA,',',1,4923) -LexToken(NUMBER,'2004',1,4924) -LexToken(CLOSEBRACKET,')',1,4928) -LexToken(SEMICOLON,';',1,4929) -LexToken(EOL,'\n',1,4930) -LexToken(IF,'if',1,4947) -LexToken(OPENBRACKET,'(',1,4950) -LexToken(VAR,'find',1,4951) -LexToken(OPENBRACKET,'(',1,4955) -LexToken(VAR,'oper',1,4956) -LexToken(COMPARISON,'==',1,4961) -LexToken(NUMBER,'1',1,4964) -LexToken(CLOSEBRACKET,')',1,4965) -LexToken(COMPARISON,'~=',1,4967) -LexToken(OPENSQBRACKET,'[',1,4970) -LexToken(CLOSESQBRACKET,']',1,4971) -LexToken(CLOSEBRACKET,')',1,4972) -LexToken(THEN,'then',1,4974) -LexToken(EOL,'\n',1,4978) -LexToken(VAR,'model',1,4999) -LexToken(DOT,'.',1,5004) -LexToken(VAR,'state',1,5005) -LexToken(ASSIGNMENT,'=',1,5010) -LexToken(VAR,'zeros',1,5011) -LexToken(OPENBRACKET,'(',1,5016) -LexToken(NUMBER,'2',1,5017) -LexToken(OPERATOR,'*',1,5018) -LexToken(VAR,'Nbr_maillage',1,5019) -LexToken(COMMA,',',1,5031) -LexToken(NUMBER,'1',1,5032) -LexToken(CLOSEBRACKET,')',1,5033) -LexToken(SEMICOLON,';',1,5034) -LexToken(EOL,'\n',1,5035) -LexToken(ELSE,'else',1,5052) -LexToken(EOL,'\n',1,5056) -LexToken(VAR,'model',1,5077) -LexToken(DOT,'.',1,5082) -LexToken(VAR,'state',1,5083) -LexToken(ASSIGNMENT,'=',1,5088) -LexToken(VAR,'zeros',1,5089) -LexToken(OPENBRACKET,'(',1,5094) -LexToken(VAR,'Nbr_maillage',1,5095) -LexToken(COMMA,',',1,5107) -LexToken(NUMBER,'1',1,5108) -LexToken(CLOSEBRACKET,')',1,5109) -LexToken(SEMICOLON,';',1,5110) -LexToken(EOL,'\n',1,5111) -LexToken(END,'end',1,5128) -LexToken(EOL,'\n',1,5131) -LexToken(ELSEIF,'elseif',1,5144) -LexToken(OPENBRACKET,'(',1,5151) -LexToken(VAR,'flag_type',1,5152) -LexToken(COMPARISON,'==',1,5162) -LexToken(NUMBER,'2',1,5165) -LexToken(CLOSEBRACKET,')',1,5166) -LexToken(THEN,'then',1,5168) -LexToken(EOL,'\n',1,5172) -LexToken(VAR,'model',1,5189) -LexToken(DOT,'.',1,5194) -LexToken(VAR,'sim',1,5195) -LexToken(ASSIGNMENT,'=',1,5198) -LexToken(VAR,'list',1,5199) -LexToken(OPENBRACKET,'(',1,5203) -LexToken(VAR,'rdnom',1,5204) -LexToken(COMMA,',',1,5209) -LexToken(NUMBER,'12004',1,5210) -LexToken(CLOSEBRACKET,')',1,5215) -LexToken(SEMICOLON,';',1,5216) -LexToken(EOL,'\n',1,5217) -LexToken(IF,'if',1,5234) -LexToken(OPENBRACKET,'(',1,5237) -LexToken(VAR,'find',1,5238) -LexToken(OPENBRACKET,'(',1,5242) -LexToken(VAR,'oper',1,5243) -LexToken(COMPARISON,'==',1,5248) -LexToken(NUMBER,'1',1,5251) -LexToken(CLOSEBRACKET,')',1,5252) -LexToken(COMPARISON,'~=',1,5254) -LexToken(OPENSQBRACKET,'[',1,5257) -LexToken(CLOSESQBRACKET,']',1,5258) -LexToken(CLOSEBRACKET,')',1,5259) -LexToken(THEN,'then',1,5261) -LexToken(EOL,'\n',1,5265) -LexToken(IF,'if',1,5286) -LexToken(OPENBRACKET,'(',1,5289) -LexToken(VAR,'type_meth',1,5290) -LexToken(COMPARISON,'==',1,5300) -LexToken(NUMBER,'3',1,5302) -LexToken(LOGICAL,'&',1,5304) -LexToken(OPENBRACKET,'(',1,5306) -LexToken(VAR,'find',1,5307) -LexToken(OPENBRACKET,'(',1,5311) -LexToken(VAR,'oper',1,5312) -LexToken(COMPARISON,'==',1,5317) -LexToken(NUMBER,'2',1,5320) -LexToken(CLOSEBRACKET,')',1,5321) -LexToken(COMPARISON,'~=',1,5323) -LexToken(OPENSQBRACKET,'[',1,5326) -LexToken(CLOSESQBRACKET,']',1,5327) -LexToken(LOGICAL,'|',1,5329) -LexToken(VAR,'find',1,5331) -LexToken(OPENBRACKET,'(',1,5335) -LexToken(VAR,'oper',1,5336) -LexToken(COMPARISON,'==',1,5341) -LexToken(NUMBER,'4',1,5344) -LexToken(CLOSEBRACKET,')',1,5345) -LexToken(COMPARISON,'~=',1,5347) -LexToken(OPENSQBRACKET,'[',1,5350) -LexToken(CLOSESQBRACKET,']',1,5351) -LexToken(CLOSEBRACKET,')',1,5352) -LexToken(CLOSEBRACKET,')',1,5353) -LexToken(THEN,'then',1,5355) -LexToken(EOL,'\n',1,5359) -LexToken(VAR,'model',1,5384) -LexToken(DOT,'.',1,5389) -LexToken(VAR,'state',1,5390) -LexToken(ASSIGNMENT,'=',1,5395) -LexToken(VAR,'zeros',1,5396) -LexToken(OPENBRACKET,'(',1,5401) -LexToken(NUMBER,'6',1,5402) -LexToken(OPERATOR,'*',1,5403) -LexToken(VAR,'Nbr_maillage',1,5404) -LexToken(COMMA,',',1,5416) -LexToken(NUMBER,'1',1,5417) -LexToken(CLOSEBRACKET,')',1,5418) -LexToken(SEMICOLON,';',1,5419) -LexToken(EOL,'\n',1,5420) -LexToken(ELSEIF,'elseif',1,5441) -LexToken(OPENBRACKET,'(',1,5448) -LexToken(VAR,'type_meth',1,5449) -LexToken(COMPARISON,'==',1,5459) -LexToken(NUMBER,'1',1,5462) -LexToken(CLOSEBRACKET,')',1,5463) -LexToken(THEN,'then',1,5465) -LexToken(EOL,'\n',1,5469) -LexToken(VAR,'model',1,5494) -LexToken(DOT,'.',1,5499) -LexToken(VAR,'state',1,5500) -LexToken(ASSIGNMENT,'=',1,5505) -LexToken(VAR,'zeros',1,5506) -LexToken(OPENBRACKET,'(',1,5511) -LexToken(NUMBER,'4',1,5512) -LexToken(OPERATOR,'*',1,5513) -LexToken(VAR,'Nbr',1,5514) -LexToken(COMMA,',',1,5517) -LexToken(NUMBER,'1',1,5518) -LexToken(CLOSEBRACKET,')',1,5519) -LexToken(SEMICOLON,';',1,5520) -LexToken(EOL,'\n',1,5521) -LexToken(ELSE,'else',1,5542) -LexToken(EOL,'\n',1,5546) -LexToken(VAR,'model',1,5571) -LexToken(DOT,'.',1,5576) -LexToken(VAR,'state',1,5577) -LexToken(ASSIGNMENT,'=',1,5582) -LexToken(VAR,'zeros',1,5583) -LexToken(OPENBRACKET,'(',1,5588) -LexToken(NUMBER,'4',1,5589) -LexToken(OPERATOR,'*',1,5590) -LexToken(VAR,'Nbr_maillage',1,5591) -LexToken(COMMA,',',1,5603) -LexToken(NUMBER,'1',1,5604) -LexToken(CLOSEBRACKET,')',1,5605) -LexToken(SEMICOLON,';',1,5606) -LexToken(EOL,'\n',1,5607) -LexToken(END,'end',1,5628) -LexToken(EOL,'\n',1,5631) -LexToken(ELSE,'else',1,5648) -LexToken(EOL,'\n',1,5652) -LexToken(IF,'if',1,5673) -LexToken(OPENBRACKET,'(',1,5676) -LexToken(VAR,'type_meth',1,5677) -LexToken(COMPARISON,'==',1,5687) -LexToken(NUMBER,'3',1,5690) -LexToken(LOGICAL,'&',1,5692) -LexToken(OPENBRACKET,'(',1,5694) -LexToken(VAR,'find',1,5695) -LexToken(OPENBRACKET,'(',1,5699) -LexToken(VAR,'oper',1,5700) -LexToken(COMPARISON,'==',1,5705) -LexToken(NUMBER,'2',1,5708) -LexToken(CLOSEBRACKET,')',1,5709) -LexToken(COMPARISON,'~=',1,5711) -LexToken(OPENSQBRACKET,'[',1,5714) -LexToken(CLOSESQBRACKET,']',1,5715) -LexToken(LOGICAL,'|',1,5717) -LexToken(VAR,'find',1,5719) -LexToken(OPENBRACKET,'(',1,5723) -LexToken(VAR,'oper',1,5724) -LexToken(COMPARISON,'==',1,5729) -LexToken(NUMBER,'4',1,5732) -LexToken(CLOSEBRACKET,')',1,5733) -LexToken(COMPARISON,'~=',1,5735) -LexToken(OPENSQBRACKET,'[',1,5738) -LexToken(CLOSESQBRACKET,']',1,5739) -LexToken(CLOSEBRACKET,')',1,5740) -LexToken(CLOSEBRACKET,')',1,5741) -LexToken(THEN,'then',1,5743) -LexToken(EOL,'\n',1,5747) -LexToken(VAR,'model',1,5772) -LexToken(DOT,'.',1,5777) -LexToken(VAR,'state',1,5778) -LexToken(ASSIGNMENT,'=',1,5783) -LexToken(VAR,'zeros',1,5784) -LexToken(OPENBRACKET,'(',1,5789) -LexToken(NUMBER,'4',1,5790) -LexToken(OPERATOR,'*',1,5791) -LexToken(VAR,'Nbr_maillage',1,5792) -LexToken(COMMA,',',1,5804) -LexToken(NUMBER,'1',1,5805) -LexToken(CLOSEBRACKET,')',1,5806) -LexToken(SEMICOLON,';',1,5807) -LexToken(EOL,'\n',1,5808) -LexToken(ELSEIF,'elseif',1,5829) -LexToken(OPENBRACKET,'(',1,5836) -LexToken(VAR,'type_meth',1,5837) -LexToken(COMPARISON,'==',1,5847) -LexToken(NUMBER,'1',1,5850) -LexToken(CLOSEBRACKET,')',1,5851) -LexToken(THEN,'then',1,5853) -LexToken(EOL,'\n',1,5857) -LexToken(VAR,'model',1,5882) -LexToken(DOT,'.',1,5887) -LexToken(VAR,'state',1,5888) -LexToken(ASSIGNMENT,'=',1,5893) -LexToken(VAR,'zeros',1,5894) -LexToken(OPENBRACKET,'(',1,5899) -LexToken(NUMBER,'2',1,5900) -LexToken(OPERATOR,'*',1,5901) -LexToken(VAR,'Nbr',1,5902) -LexToken(COMMA,',',1,5905) -LexToken(NUMBER,'1',1,5906) -LexToken(CLOSEBRACKET,')',1,5907) -LexToken(SEMICOLON,';',1,5908) -LexToken(EOL,'\n',1,5909) -LexToken(ELSE,'else',1,5930) -LexToken(EOL,'\n',1,5934) -LexToken(VAR,'model',1,5959) -LexToken(DOT,'.',1,5964) -LexToken(VAR,'state',1,5965) -LexToken(ASSIGNMENT,'=',1,5970) -LexToken(VAR,'zeros',1,5971) -LexToken(OPENBRACKET,'(',1,5976) -LexToken(NUMBER,'2',1,5977) -LexToken(OPERATOR,'*',1,5978) -LexToken(VAR,'Nbr_maillage',1,5979) -LexToken(COMMA,',',1,5991) -LexToken(NUMBER,'1',1,5992) -LexToken(CLOSEBRACKET,')',1,5993) -LexToken(SEMICOLON,';',1,5994) -LexToken(EOL,'\n',1,5995) -LexToken(END,'end',1,6016) -LexToken(EOL,'\n',1,6019) -LexToken(END,'end',1,6036) -LexToken(EOL,'\n',1,6039) -LexToken(END,'end',1,6052) -LexToken(EOL,'\n',1,6055) -LexToken(EOL,'\n',1,6056) -LexToken(EOL,'\n',1,6112) -LexToken(EOL,'\n',1,6157) -LexToken(EOL,'\n',1,6194) -LexToken(OPENSQBRACKET,'[',1,6207) -LexToken(VAR,'ok1',1,6208) -LexToken(CLOSESQBRACKET,']',1,6211) -LexToken(ASSIGNMENT,'=',1,6212) -LexToken(VAR,'CFORTREDP',1,6213) -LexToken(OPENBRACKET,'(',1,6222) -LexToken(VAR,'rdnom',1,6223) -LexToken(COMMA,',',1,6228) -LexToken(VAR,'tt',1,6229) -LexToken(CLOSEBRACKET,')',1,6231) -LexToken(SEMICOLON,';',1,6232) -LexToken(EOL,'\n',1,6233) -LexToken(IF,'if',1,6246) -LexToken(NOT,'~',1,6249) -LexToken(VAR,'ok1',1,6250) -LexToken(THEN,'then',1,6254) -LexToken(EOL,'\n',1,6258) -LexToken(BREAK,'break',1,6275) -LexToken(COMMA,',',1,6280) -LexToken(EOL,'\n',1,6281) -LexToken(END,'end',1,6294) -LexToken(EOL,'\n',1,6297) -LexToken(EOL,'\n',1,6315) -LexToken(EOL,'\n',1,6316) -LexToken(IF,'if',1,6329) -LexToken(NOT,'~',1,6332) -LexToken(VAR,'ok',1,6333) -LexToken(THEN,'then',1,6336) -LexToken(EOL,'\n',1,6340) -LexToken(OPENSQBRACKET,'[',1,6357) -LexToken(VAR,'model',1,6358) -LexToken(COMMA,',',1,6363) -LexToken(VAR,'graphics',1,6364) -LexToken(COMMA,',',1,6372) -LexToken(VAR,'ok',1,6373) -LexToken(CLOSESQBRACKET,']',1,6375) -LexToken(ASSIGNMENT,'=',1,6376) -LexToken(VAR,'check_io',1,6377) -LexToken(OPENBRACKET,'(',1,6385) -LexToken(VAR,'model',1,6386) -LexToken(COMMA,',',1,6391) -LexToken(VAR,'graphics',1,6392) -LexToken(COMMA,',',1,6400) -LexToken(VAR,'ones',1,6401) -LexToken(OPENBRACKET,'(',1,6405) -LexToken(VAR,'k',1,6406) -LexToken(COMMA,',',1,6407) -LexToken(NUMBER,'1',1,6408) -LexToken(CLOSEBRACKET,')',1,6409) +LexToken(VAR,'b7',1,4321) +LexToken(COMMA,',',1,4323) +LexToken(VAR,'rdnom',1,4324) +LexToken(COMMA,',',1,4329) +LexToken(VAR,'mesures',1,4330) +LexToken(CLOSEBRACKET,')',1,4337) +LexToken(SEMICOLON,';',1,4338) +LexToken(EOL,'\n',1,4339) +LexToken(EOL,'\n',1,4358) +LexToken(EOL,'\n',1,4388) +LexToken(EOL,'\n',1,4406) +LexToken(EOL,'\n',1,4407) +LexToken(EOL,'\n',1,4470) +LexToken(VAR,'Nbr',1,4483) +LexToken(ASSIGNMENT,'=',1,4486) +LexToken(VAR,'Nbr_maillage',1,4487) +LexToken(SEMICOLON,';',1,4499) +LexToken(EOL,'\n',1,4500) +LexToken(IF,'if',1,4513) +LexToken(OPENBRACKET,'(',1,4516) +LexToken(OPENBRACKET,'(',1,4517) +LexToken(VAR,'CLa_type',1,4518) +LexToken(COMPARISON,'==',1,4527) +LexToken(NUMBER,'1',1,4530) +LexToken(CLOSEBRACKET,')',1,4531) +LexToken(LOGICAL,'&',1,4533) +LexToken(OPENBRACKET,'(',1,4535) +LexToken(VAR,'DF_type',1,4536) +LexToken(COMPARISON,'==',1,4544) +LexToken(NUMBER,'0',1,4547) +LexToken(LOGICAL,'|',1,4549) +LexToken(VAR,'DF_type',1,4551) +LexToken(COMPARISON,'==',1,4559) +LexToken(NUMBER,'1',1,4562) +LexToken(CLOSEBRACKET,')',1,4563) +LexToken(CLOSEBRACKET,')',1,4564) +LexToken(LOGICAL,'|',1,4566) +LexToken(OPENBRACKET,'(',1,4568) +LexToken(OPENBRACKET,'(',1,4569) +LexToken(VAR,'CLb_type',1,4570) +LexToken(COMPARISON,'==',1,4579) +LexToken(NUMBER,'1',1,4582) +LexToken(CLOSEBRACKET,')',1,4583) +LexToken(LOGICAL,'&',1,4585) +LexToken(OPENBRACKET,'(',1,4587) +LexToken(VAR,'DF_type',1,4588) +LexToken(COMPARISON,'==',1,4596) +LexToken(NUMBER,'0',1,4599) +LexToken(LOGICAL,'|',1,4601) +LexToken(VAR,'DF_type',1,4603) +LexToken(COMPARISON,'==',1,4611) +LexToken(NUMBER,'2',1,4614) +LexToken(CLOSEBRACKET,')',1,4615) +LexToken(CLOSEBRACKET,')',1,4616) +LexToken(THEN,'then',1,4618) +LexToken(EOL,'\n',1,4622) +LexToken(VAR,'Nbr',1,4639) +LexToken(ASSIGNMENT,'=',1,4642) +LexToken(VAR,'Nbr',1,4643) +LexToken(ADDITION,'+',1,4646) +LexToken(NUMBER,'1',1,4647) +LexToken(SEMICOLON,';',1,4648) +LexToken(EOL,'\n',1,4649) +LexToken(END,'end',1,4662) +LexToken(EOL,'\n',1,4665) +LexToken(EOL,'\n',1,4666) +LexToken(IF,'if',1,4679) +LexToken(OPENBRACKET,'(',1,4682) +LexToken(VAR,'mesures',1,4684) +LexToken(COMPARISON,'==',1,4692) +LexToken(OPENSQBRACKET,'[',1,4694) +LexToken(CLOSESQBRACKET,']',1,4695) +LexToken(CLOSEBRACKET,')',1,4696) +LexToken(THEN,'then',1,4698) +LexToken(EOL,'\n',1,4702) +LexToken(VAR,'out',1,4719) +LexToken(ASSIGNMENT,'=',1,4722) +LexToken(VAR,'Nbr_maillage',1,4723) +LexToken(SEMICOLON,';',1,4735) +LexToken(EOL,'\n',1,4736) +LexToken(ELSE,'else',1,4749) +LexToken(EOL,'\n',1,4753) +LexToken(VAR,'out',1,4770) +LexToken(ASSIGNMENT,'=',1,4773) +LexToken(OPENSQBRACKET,'[',1,4774) +LexToken(VAR,'Nbr_maillage',1,4775) +LexToken(SEMICOLON,';',1,4787) +LexToken(VAR,'size',1,4788) +LexToken(OPENBRACKET,'(',1,4792) +LexToken(VAR,'mesures',1,4793) +LexToken(COMMA,',',1,4800) +LexToken(DQSTRING,'"*"',1,4803) +LexToken(CLOSEBRACKET,')',1,4804) +LexToken(CLOSESQBRACKET,']',1,4805) +LexToken(SEMICOLON,';',1,4806) +LexToken(EOL,'\n',1,4807) +LexToken(END,'end',1,4820) +LexToken(EOL,'\n',1,4823) +LexToken(IF,'if',1,4836) +LexToken(OPENBRACKET,'(',1,4839) +LexToken(VAR,'flag_type',1,4840) +LexToken(COMPARISON,'==',1,4850) +LexToken(NUMBER,'1',1,4853) +LexToken(CLOSEBRACKET,')',1,4854) +LexToken(THEN,'then',1,4856) +LexToken(EOL,'\n',1,4860) +LexToken(EOL,'\n',1,4889) +LexToken(VAR,'model',1,4906) +LexToken(DOT,'.',1,4911) +LexToken(VAR,'sim',1,4912) +LexToken(ASSIGNMENT,'=',1,4915) +LexToken(VAR,'list',1,4916) +LexToken(OPENBRACKET,'(',1,4920) +LexToken(VAR,'rdnom',1,4921) +LexToken(COMMA,',',1,4926) +LexToken(NUMBER,'2004',1,4927) +LexToken(CLOSEBRACKET,')',1,4931) +LexToken(SEMICOLON,';',1,4932) +LexToken(EOL,'\n',1,4933) +LexToken(IF,'if',1,4950) +LexToken(OPENBRACKET,'(',1,4953) +LexToken(VAR,'find',1,4954) +LexToken(OPENBRACKET,'(',1,4958) +LexToken(VAR,'oper',1,4959) +LexToken(COMPARISON,'==',1,4964) +LexToken(NUMBER,'1',1,4967) +LexToken(CLOSEBRACKET,')',1,4968) +LexToken(COMPARISON,'~=',1,4970) +LexToken(OPENSQBRACKET,'[',1,4973) +LexToken(CLOSESQBRACKET,']',1,4974) +LexToken(CLOSEBRACKET,')',1,4975) +LexToken(THEN,'then',1,4977) +LexToken(EOL,'\n',1,4981) +LexToken(VAR,'model',1,5002) +LexToken(DOT,'.',1,5007) +LexToken(VAR,'state',1,5008) +LexToken(ASSIGNMENT,'=',1,5013) +LexToken(VAR,'zeros',1,5014) +LexToken(OPENBRACKET,'(',1,5019) +LexToken(NUMBER,'2',1,5020) +LexToken(MULTIPLICATION,'*',1,5021) +LexToken(VAR,'Nbr_maillage',1,5022) +LexToken(COMMA,',',1,5034) +LexToken(NUMBER,'1',1,5035) +LexToken(CLOSEBRACKET,')',1,5036) +LexToken(SEMICOLON,';',1,5037) +LexToken(EOL,'\n',1,5038) +LexToken(ELSE,'else',1,5055) +LexToken(EOL,'\n',1,5059) +LexToken(VAR,'model',1,5080) +LexToken(DOT,'.',1,5085) +LexToken(VAR,'state',1,5086) +LexToken(ASSIGNMENT,'=',1,5091) +LexToken(VAR,'zeros',1,5092) +LexToken(OPENBRACKET,'(',1,5097) +LexToken(VAR,'Nbr_maillage',1,5098) +LexToken(COMMA,',',1,5110) +LexToken(NUMBER,'1',1,5111) +LexToken(CLOSEBRACKET,')',1,5112) +LexToken(SEMICOLON,';',1,5113) +LexToken(EOL,'\n',1,5114) +LexToken(END,'end',1,5131) +LexToken(EOL,'\n',1,5134) +LexToken(ELSEIF,'elseif',1,5147) +LexToken(OPENBRACKET,'(',1,5154) +LexToken(VAR,'flag_type',1,5155) +LexToken(COMPARISON,'==',1,5165) +LexToken(NUMBER,'2',1,5168) +LexToken(CLOSEBRACKET,')',1,5169) +LexToken(THEN,'then',1,5171) +LexToken(EOL,'\n',1,5175) +LexToken(VAR,'model',1,5192) +LexToken(DOT,'.',1,5197) +LexToken(VAR,'sim',1,5198) +LexToken(ASSIGNMENT,'=',1,5201) +LexToken(VAR,'list',1,5202) +LexToken(OPENBRACKET,'(',1,5206) +LexToken(VAR,'rdnom',1,5207) +LexToken(COMMA,',',1,5212) +LexToken(NUMBER,'12004',1,5213) +LexToken(CLOSEBRACKET,')',1,5218) +LexToken(SEMICOLON,';',1,5219) +LexToken(EOL,'\n',1,5220) +LexToken(IF,'if',1,5237) +LexToken(OPENBRACKET,'(',1,5240) +LexToken(VAR,'find',1,5241) +LexToken(OPENBRACKET,'(',1,5245) +LexToken(VAR,'oper',1,5246) +LexToken(COMPARISON,'==',1,5251) +LexToken(NUMBER,'1',1,5254) +LexToken(CLOSEBRACKET,')',1,5255) +LexToken(COMPARISON,'~=',1,5257) +LexToken(OPENSQBRACKET,'[',1,5260) +LexToken(CLOSESQBRACKET,']',1,5261) +LexToken(CLOSEBRACKET,')',1,5262) +LexToken(THEN,'then',1,5264) +LexToken(EOL,'\n',1,5268) +LexToken(IF,'if',1,5289) +LexToken(OPENBRACKET,'(',1,5292) +LexToken(VAR,'type_meth',1,5293) +LexToken(COMPARISON,'==',1,5303) +LexToken(NUMBER,'3',1,5305) +LexToken(LOGICAL,'&',1,5307) +LexToken(OPENBRACKET,'(',1,5309) +LexToken(VAR,'find',1,5310) +LexToken(OPENBRACKET,'(',1,5314) +LexToken(VAR,'oper',1,5315) +LexToken(COMPARISON,'==',1,5320) +LexToken(NUMBER,'2',1,5323) +LexToken(CLOSEBRACKET,')',1,5324) +LexToken(COMPARISON,'~=',1,5326) +LexToken(OPENSQBRACKET,'[',1,5329) +LexToken(CLOSESQBRACKET,']',1,5330) +LexToken(LOGICAL,'|',1,5332) +LexToken(VAR,'find',1,5334) +LexToken(OPENBRACKET,'(',1,5338) +LexToken(VAR,'oper',1,5339) +LexToken(COMPARISON,'==',1,5344) +LexToken(NUMBER,'4',1,5347) +LexToken(CLOSEBRACKET,')',1,5348) +LexToken(COMPARISON,'~=',1,5350) +LexToken(OPENSQBRACKET,'[',1,5353) +LexToken(CLOSESQBRACKET,']',1,5354) +LexToken(CLOSEBRACKET,')',1,5355) +LexToken(CLOSEBRACKET,')',1,5356) +LexToken(THEN,'then',1,5358) +LexToken(EOL,'\n',1,5362) +LexToken(VAR,'model',1,5387) +LexToken(DOT,'.',1,5392) +LexToken(VAR,'state',1,5393) +LexToken(ASSIGNMENT,'=',1,5398) +LexToken(VAR,'zeros',1,5399) +LexToken(OPENBRACKET,'(',1,5404) +LexToken(NUMBER,'6',1,5405) +LexToken(MULTIPLICATION,'*',1,5406) +LexToken(VAR,'Nbr_maillage',1,5407) +LexToken(COMMA,',',1,5419) +LexToken(NUMBER,'1',1,5420) +LexToken(CLOSEBRACKET,')',1,5421) +LexToken(SEMICOLON,';',1,5422) +LexToken(EOL,'\n',1,5423) +LexToken(ELSEIF,'elseif',1,5444) +LexToken(OPENBRACKET,'(',1,5451) +LexToken(VAR,'type_meth',1,5452) +LexToken(COMPARISON,'==',1,5462) +LexToken(NUMBER,'1',1,5465) +LexToken(CLOSEBRACKET,')',1,5466) +LexToken(THEN,'then',1,5468) +LexToken(EOL,'\n',1,5472) +LexToken(VAR,'model',1,5497) +LexToken(DOT,'.',1,5502) +LexToken(VAR,'state',1,5503) +LexToken(ASSIGNMENT,'=',1,5508) +LexToken(VAR,'zeros',1,5509) +LexToken(OPENBRACKET,'(',1,5514) +LexToken(NUMBER,'4',1,5515) +LexToken(MULTIPLICATION,'*',1,5516) +LexToken(VAR,'Nbr',1,5517) +LexToken(COMMA,',',1,5520) +LexToken(NUMBER,'1',1,5521) +LexToken(CLOSEBRACKET,')',1,5522) +LexToken(SEMICOLON,';',1,5523) +LexToken(EOL,'\n',1,5524) +LexToken(ELSE,'else',1,5545) +LexToken(EOL,'\n',1,5549) +LexToken(VAR,'model',1,5574) +LexToken(DOT,'.',1,5579) +LexToken(VAR,'state',1,5580) +LexToken(ASSIGNMENT,'=',1,5585) +LexToken(VAR,'zeros',1,5586) +LexToken(OPENBRACKET,'(',1,5591) +LexToken(NUMBER,'4',1,5592) +LexToken(MULTIPLICATION,'*',1,5593) +LexToken(VAR,'Nbr_maillage',1,5594) +LexToken(COMMA,',',1,5606) +LexToken(NUMBER,'1',1,5607) +LexToken(CLOSEBRACKET,')',1,5608) +LexToken(SEMICOLON,';',1,5609) +LexToken(EOL,'\n',1,5610) +LexToken(END,'end',1,5631) +LexToken(EOL,'\n',1,5634) +LexToken(ELSE,'else',1,5651) +LexToken(EOL,'\n',1,5655) +LexToken(IF,'if',1,5676) +LexToken(OPENBRACKET,'(',1,5679) +LexToken(VAR,'type_meth',1,5680) +LexToken(COMPARISON,'==',1,5690) +LexToken(NUMBER,'3',1,5693) +LexToken(LOGICAL,'&',1,5695) +LexToken(OPENBRACKET,'(',1,5697) +LexToken(VAR,'find',1,5698) +LexToken(OPENBRACKET,'(',1,5702) +LexToken(VAR,'oper',1,5703) +LexToken(COMPARISON,'==',1,5708) +LexToken(NUMBER,'2',1,5711) +LexToken(CLOSEBRACKET,')',1,5712) +LexToken(COMPARISON,'~=',1,5714) +LexToken(OPENSQBRACKET,'[',1,5717) +LexToken(CLOSESQBRACKET,']',1,5718) +LexToken(LOGICAL,'|',1,5720) +LexToken(VAR,'find',1,5722) +LexToken(OPENBRACKET,'(',1,5726) +LexToken(VAR,'oper',1,5727) +LexToken(COMPARISON,'==',1,5732) +LexToken(NUMBER,'4',1,5735) +LexToken(CLOSEBRACKET,')',1,5736) +LexToken(COMPARISON,'~=',1,5738) +LexToken(OPENSQBRACKET,'[',1,5741) +LexToken(CLOSESQBRACKET,']',1,5742) +LexToken(CLOSEBRACKET,')',1,5743) +LexToken(CLOSEBRACKET,')',1,5744) +LexToken(THEN,'then',1,5746) +LexToken(EOL,'\n',1,5750) +LexToken(VAR,'model',1,5775) +LexToken(DOT,'.',1,5780) +LexToken(VAR,'state',1,5781) +LexToken(ASSIGNMENT,'=',1,5786) +LexToken(VAR,'zeros',1,5787) +LexToken(OPENBRACKET,'(',1,5792) +LexToken(NUMBER,'4',1,5793) +LexToken(MULTIPLICATION,'*',1,5794) +LexToken(VAR,'Nbr_maillage',1,5795) +LexToken(COMMA,',',1,5807) +LexToken(NUMBER,'1',1,5808) +LexToken(CLOSEBRACKET,')',1,5809) +LexToken(SEMICOLON,';',1,5810) +LexToken(EOL,'\n',1,5811) +LexToken(ELSEIF,'elseif',1,5832) +LexToken(OPENBRACKET,'(',1,5839) +LexToken(VAR,'type_meth',1,5840) +LexToken(COMPARISON,'==',1,5850) +LexToken(NUMBER,'1',1,5853) +LexToken(CLOSEBRACKET,')',1,5854) +LexToken(THEN,'then',1,5856) +LexToken(EOL,'\n',1,5860) +LexToken(VAR,'model',1,5885) +LexToken(DOT,'.',1,5890) +LexToken(VAR,'state',1,5891) +LexToken(ASSIGNMENT,'=',1,5896) +LexToken(VAR,'zeros',1,5897) +LexToken(OPENBRACKET,'(',1,5902) +LexToken(NUMBER,'2',1,5903) +LexToken(MULTIPLICATION,'*',1,5904) +LexToken(VAR,'Nbr',1,5905) +LexToken(COMMA,',',1,5908) +LexToken(NUMBER,'1',1,5909) +LexToken(CLOSEBRACKET,')',1,5910) +LexToken(SEMICOLON,';',1,5911) +LexToken(EOL,'\n',1,5912) +LexToken(ELSE,'else',1,5933) +LexToken(EOL,'\n',1,5937) +LexToken(VAR,'model',1,5962) +LexToken(DOT,'.',1,5967) +LexToken(VAR,'state',1,5968) +LexToken(ASSIGNMENT,'=',1,5973) +LexToken(VAR,'zeros',1,5974) +LexToken(OPENBRACKET,'(',1,5979) +LexToken(NUMBER,'2',1,5980) +LexToken(MULTIPLICATION,'*',1,5981) +LexToken(VAR,'Nbr_maillage',1,5982) +LexToken(COMMA,',',1,5994) +LexToken(NUMBER,'1',1,5995) +LexToken(CLOSEBRACKET,')',1,5996) +LexToken(SEMICOLON,';',1,5997) +LexToken(EOL,'\n',1,5998) +LexToken(END,'end',1,6019) +LexToken(EOL,'\n',1,6022) +LexToken(END,'end',1,6039) +LexToken(EOL,'\n',1,6042) +LexToken(END,'end',1,6055) +LexToken(EOL,'\n',1,6058) +LexToken(EOL,'\n',1,6059) +LexToken(EOL,'\n',1,6115) +LexToken(EOL,'\n',1,6160) +LexToken(EOL,'\n',1,6197) +LexToken(OPENSQBRACKET,'[',1,6210) +LexToken(VAR,'ok1',1,6211) +LexToken(CLOSESQBRACKET,']',1,6214) +LexToken(ASSIGNMENT,'=',1,6215) +LexToken(VAR,'CFORTREDP',1,6216) +LexToken(OPENBRACKET,'(',1,6225) +LexToken(VAR,'rdnom',1,6226) +LexToken(COMMA,',',1,6231) +LexToken(VAR,'tt',1,6232) +LexToken(CLOSEBRACKET,')',1,6234) +LexToken(SEMICOLON,';',1,6235) +LexToken(EOL,'\n',1,6236) +LexToken(IF,'if',1,6249) +LexToken(NOT,'~',1,6252) +LexToken(VAR,'ok1',1,6253) +LexToken(THEN,'then',1,6257) +LexToken(EOL,'\n',1,6261) +LexToken(BREAK,'break',1,6278) +LexToken(COMMA,',',1,6283) +LexToken(EOL,'\n',1,6284) +LexToken(END,'end',1,6297) +LexToken(EOL,'\n',1,6300) +LexToken(EOL,'\n',1,6318) +LexToken(EOL,'\n',1,6319) +LexToken(IF,'if',1,6332) +LexToken(NOT,'~',1,6335) +LexToken(VAR,'ok',1,6336) +LexToken(THEN,'then',1,6339) +LexToken(EOL,'\n',1,6343) +LexToken(OPENSQBRACKET,'[',1,6360) +LexToken(VAR,'model',1,6361) +LexToken(COMMA,',',1,6366) +LexToken(VAR,'graphics',1,6367) +LexToken(COMMA,',',1,6375) +LexToken(VAR,'ok',1,6376) +LexToken(CLOSESQBRACKET,']',1,6378) +LexToken(ASSIGNMENT,'=',1,6379) +LexToken(VAR,'check_io',1,6380) +LexToken(OPENBRACKET,'(',1,6388) +LexToken(VAR,'model',1,6389) +LexToken(COMMA,',',1,6394) +LexToken(VAR,'graphics',1,6395) +LexToken(COMMA,',',1,6403) +LexToken(VAR,'ones',1,6404) +LexToken(OPENBRACKET,'(',1,6408) +LexToken(VAR,'k',1,6409) LexToken(COMMA,',',1,6410) -LexToken(VAR,'out',1,6411) -LexToken(OPENBRACKET,'(',1,6414) -LexToken(COLON,':',1,6415) -LexToken(CLOSEBRACKET,')',1,6416) -LexToken(COMMA,',',1,6417) -LexToken(OPENSQBRACKET,'[',1,6418) -LexToken(CLOSESQBRACKET,']',1,6419) +LexToken(NUMBER,'1',1,6411) +LexToken(CLOSEBRACKET,')',1,6412) +LexToken(COMMA,',',1,6413) +LexToken(VAR,'out',1,6414) +LexToken(OPENBRACKET,'(',1,6417) +LexToken(COLON,':',1,6418) +LexToken(CLOSEBRACKET,')',1,6419) LexToken(COMMA,',',1,6420) LexToken(OPENSQBRACKET,'[',1,6421) LexToken(CLOSESQBRACKET,']',1,6422) -LexToken(CLOSEBRACKET,')',1,6423) -LexToken(EOL,'\n',1,6424) -LexToken(END,'end',1,6437) -LexToken(EOL,'\n',1,6440) -LexToken(VAR,'label',1,6453) -LexToken(OPENBRACKET,'(',1,6458) -LexToken(NUMBER,'1',1,6459) -LexToken(CLOSEBRACKET,')',1,6460) -LexToken(ASSIGNMENT,'=',1,6461) -LexToken(VAR,'params_pde',1,6462) -LexToken(SEMICOLON,';',1,6472) -LexToken(EOL,'\n',1,6473) -LexToken(VAR,'label',1,6486) -LexToken(OPENBRACKET,'(',1,6491) -LexToken(NUMBER,'2',1,6492) -LexToken(CLOSEBRACKET,')',1,6493) -LexToken(ASSIGNMENT,'=',1,6494) -LexToken(VAR,'tt',1,6495) -LexToken(SEMICOLON,';',1,6497) -LexToken(EOL,'\n',1,6498) -LexToken(VAR,'graphics',1,6511) -LexToken(DOT,'.',1,6519) -LexToken(VAR,'exprs',1,6520) -LexToken(ASSIGNMENT,'=',1,6525) -LexToken(VAR,'label',1,6526) -LexToken(SEMICOLON,';',1,6531) -LexToken(EOL,'\n',1,6532) -LexToken(VAR,'x',1,6545) -LexToken(DOT,'.',1,6546) -LexToken(VAR,'graphics',1,6547) -LexToken(ASSIGNMENT,'=',1,6555) -LexToken(VAR,'graphics',1,6556) -LexToken(SEMICOLON,';',1,6564) -LexToken(EOL,'\n',1,6565) -LexToken(VAR,'x',1,6578) -LexToken(DOT,'.',1,6579) -LexToken(VAR,'model',1,6580) -LexToken(ASSIGNMENT,'=',1,6585) -LexToken(VAR,'model',1,6586) -LexToken(SEMICOLON,';',1,6591) -LexToken(EOL,'\n',1,6592) -LexToken(BREAK,'break',1,6605) -LexToken(EOL,'\n',1,6610) -LexToken(END,'end',1,6619) -LexToken(EOL,'\n',1,6622) -LexToken(EOL,'\n',1,6623) -LexToken(CASE,'case',1,6628) -LexToken(DQSTRING,'"define"',1,6640) -LexToken(THEN,'then',1,6642) -LexToken(EOL,'\n',1,6646) -LexToken(VAR,'model',1,6655) -LexToken(ASSIGNMENT,'=',1,6660) -LexToken(SCICOS_MODEL,'scicos_model',1,6661) -LexToken(OPENBRACKET,'(',1,6673) -LexToken(CLOSEBRACKET,')',1,6674) -LexToken(EOL,'\n',1,6675) -LexToken(VAR,'model',1,6684) -LexToken(DOT,'.',1,6689) -LexToken(VAR,'state',1,6690) -LexToken(ASSIGNMENT,'=',1,6695) -LexToken(VAR,'zeros',1,6696) -LexToken(OPENBRACKET,'(',1,6701) -LexToken(NUMBER,'10',1,6702) -LexToken(COMMA,',',1,6704) -LexToken(NUMBER,'1',1,6705) -LexToken(CLOSEBRACKET,')',1,6706) -LexToken(EOL,'\n',1,6707) -LexToken(VAR,'model',1,6716) -LexToken(DOT,'.',1,6721) -LexToken(VAR,'sim',1,6722) -LexToken(ASSIGNMENT,'=',1,6725) -LexToken(VAR,'list',1,6726) -LexToken(OPENBRACKET,'(',1,6730) -LexToken(DQSTRING,'"PDE"',1,6735) -LexToken(COMMA,',',1,6736) -LexToken(NUMBER,'0',1,6737) -LexToken(CLOSEBRACKET,')',1,6738) -LexToken(EOL,'\n',1,6739) -LexToken(VAR,'model',1,6748) -LexToken(DOT,'.',1,6753) -LexToken(VAR,'in',1,6754) -LexToken(ASSIGNMENT,'=',1,6756) -LexToken(OPENSQBRACKET,'[',1,6757) -LexToken(NUMBER,'1',1,6758) -LexToken(SEMICOLON,';',1,6759) -LexToken(NUMBER,'1',1,6760) -LexToken(SEMICOLON,';',1,6761) -LexToken(NUMBER,'1',1,6762) -LexToken(SEMICOLON,';',1,6763) -LexToken(NUMBER,'1',1,6764) -LexToken(SEMICOLON,';',1,6765) -LexToken(NUMBER,'1',1,6766) -LexToken(CLOSESQBRACKET,']',1,6767) -LexToken(EOL,'\n',1,6768) -LexToken(VAR,'model',1,6777) -LexToken(DOT,'.',1,6782) -LexToken(VAR,'out',1,6783) -LexToken(ASSIGNMENT,'=',1,6786) -LexToken(OPENSQBRACKET,'[',1,6787) -LexToken(NUMBER,'10',1,6788) -LexToken(SEMICOLON,';',1,6790) -LexToken(NUMBER,'0',1,6791) -LexToken(CLOSESQBRACKET,']',1,6792) -LexToken(EOL,'\n',1,6793) -LexToken(VAR,'model',1,6802) -LexToken(DOT,'.',1,6807) -LexToken(VAR,'blocktype',1,6808) -LexToken(ASSIGNMENT,'=',1,6817) -LexToken(DQSTRING,'"c"',1,6820) -LexToken(EOL,'\n',1,6821) -LexToken(VAR,'model',1,6830) -LexToken(DOT,'.',1,6835) -LexToken(VAR,'dep_ut',1,6836) -LexToken(ASSIGNMENT,'=',1,6842) -LexToken(OPENSQBRACKET,'[',1,6843) -LexToken(PREVAR_BOOLEAN,'%f',1,6844) -LexToken(PREVAR_BOOLEAN,'%t',1,6847) -LexToken(CLOSESQBRACKET,']',1,6849) -LexToken(EOL,'\n',1,6850) -LexToken(EOL,'\n',1,6851) -LexToken(EOL,'\n',1,6885) -LexToken(VAR,'params_pde',1,6894) -LexToken(ASSIGNMENT,'=',1,6904) -LexToken(VAR,'tlist',1,6905) -LexToken(OPENBRACKET,'(',1,6910) -LexToken(OPENSQBRACKET,'[',1,6911) -LexToken(DQSTRING,'"paramspde"',1,6922) -LexToken(SEMICOLON,';',1,6923) -LexToken(DQSTRING,'"a"',1,6926) -LexToken(SEMICOLON,';',1,6927) -LexToken(DQSTRING,'"b"',1,6930) -LexToken(SEMICOLON,';',1,6931) -LexToken(DQSTRING,'"txt_exp"',1,6940) -LexToken(SEMICOLON,';',1,6941) -LexToken(DQSTRING,'"check_op1"',1,6952) -LexToken(SEMICOLON,';',1,6953) -LexToken(DQSTRING,'"a1"',1,6957) -LexToken(SEMICOLON,';',1,6958) -LexToken(DQSTRING,'"b1"',1,6962) -LexToken(SEMICOLON,';',1,6963) -LexToken(DQSTRING,'"check_op2"',1,6974) -LexToken(SEMICOLON,';',1,6975) -LexToken(DQSTRING,'"a2"',1,6979) -LexToken(SEMICOLON,';',1,6980) -LexToken(DQSTRING,'"b2"',1,6984) -LexToken(SEMICOLON,';',1,6985) -LexToken(DQSTRING,'"check_op3"',1,7007) -LexToken(SEMICOLON,';',1,7008) -LexToken(DQSTRING,'"a3"',1,7012) -LexToken(SEMICOLON,';',1,7013) -LexToken(DQSTRING,'"b3"',1,7017) -LexToken(SEMICOLON,';',1,7018) -LexToken(DQSTRING,'"check_op4"',1,7029) -LexToken(SEMICOLON,';',1,7030) -LexToken(DQSTRING,'"a4"',1,7034) -LexToken(SEMICOLON,';',1,7035) -LexToken(DQSTRING,'"b4"',1,7039) -LexToken(SEMICOLON,';',1,7040) -LexToken(DQSTRING,'"check_op5"',1,7051) -LexToken(SEMICOLON,';',1,7052) -LexToken(DQSTRING,'"a5"',1,7056) -LexToken(SEMICOLON,';',1,7057) -LexToken(DQSTRING,'"b5"',1,7061) -LexToken(SEMICOLON,';',1,7062) -LexToken(DQSTRING,'"check_op6"',1,7073) -LexToken(SEMICOLON,';',1,7074) -LexToken(DQSTRING,'"a6"',1,7078) -LexToken(SEMICOLON,';',1,7079) -LexToken(DQSTRING,'"b6"',1,7083) -LexToken(SEMICOLON,';',1,7084) -LexToken(DQSTRING,'"check_op7"',1,7106) -LexToken(SEMICOLON,';',1,7107) -LexToken(DQSTRING,'"a7"',1,7111) -LexToken(SEMICOLON,';',1,7112) -LexToken(DQSTRING,'"b7"',1,7116) -LexToken(SEMICOLON,';',1,7117) -LexToken(DQSTRING,'"discr_cst"',1,7128) -LexToken(SEMICOLON,';',1,7129) -LexToken(DQSTRING,'"discr_non_cst"',1,7144) -LexToken(SEMICOLON,';',1,7145) -LexToken(DQSTRING,'"signe"',1,7152) -LexToken(SEMICOLON,';',1,7153) -LexToken(DQSTRING,'"rad_automatique"',1,7170) -LexToken(SEMICOLON,';',1,7171) -LexToken(DQSTRING,'"rad_manuel"',1,7183) -LexToken(SEMICOLON,';',1,7184) -LexToken(DQSTRING,'"methode"',1,7204) -LexToken(SEMICOLON,';',1,7205) -LexToken(DQSTRING,'"ord1"',1,7211) -LexToken(SEMICOLON,';',1,7212) -LexToken(DQSTRING,'"ord2"',1,7218) -LexToken(SEMICOLON,';',1,7219) -LexToken(DQSTRING,'"ord3"',1,7225) -LexToken(SEMICOLON,';',1,7226) -LexToken(DQSTRING,'"degre"',1,7233) -LexToken(SEMICOLON,';',1,7234) -LexToken(DQSTRING,'"nnode"',1,7241) -LexToken(SEMICOLON,';',1,7242) -LexToken(DQSTRING,'"txt_pas"',1,7251) -LexToken(SEMICOLON,';',1,7252) -LexToken(DQSTRING,'"CI"',1,7256) -LexToken(SEMICOLON,';',1,7257) -LexToken(DQSTRING,'"dCI"',1,7262) -LexToken(SEMICOLON,';',1,7263) -LexToken(DQSTRING,'"CLa"',1,7268) -LexToken(SEMICOLON,';',1,7269) -LexToken(DQSTRING,'"CLa_exp"',1,7278) -LexToken(SEMICOLON,';',1,7279) -LexToken(DQSTRING,'"CLb"',1,7284) -LexToken(SEMICOLON,';',1,7285) -LexToken(DQSTRING,'"CLb_exp"',1,7305) -LexToken(SEMICOLON,';',1,7306) -LexToken(DQSTRING,'"points"',1,7314) -LexToken(CLOSESQBRACKET,']',1,7315) -LexToken(COMMA,',',1,7316) -LexToken(DQSTRING,'""',1,7318) +LexToken(COMMA,',',1,6423) +LexToken(OPENSQBRACKET,'[',1,6424) +LexToken(CLOSESQBRACKET,']',1,6425) +LexToken(CLOSEBRACKET,')',1,6426) +LexToken(EOL,'\n',1,6427) +LexToken(END,'end',1,6440) +LexToken(EOL,'\n',1,6443) +LexToken(VAR,'label',1,6456) +LexToken(OPENBRACKET,'(',1,6461) +LexToken(NUMBER,'1',1,6462) +LexToken(CLOSEBRACKET,')',1,6463) +LexToken(ASSIGNMENT,'=',1,6464) +LexToken(VAR,'params_pde',1,6465) +LexToken(SEMICOLON,';',1,6475) +LexToken(EOL,'\n',1,6476) +LexToken(VAR,'label',1,6489) +LexToken(OPENBRACKET,'(',1,6494) +LexToken(NUMBER,'2',1,6495) +LexToken(CLOSEBRACKET,')',1,6496) +LexToken(ASSIGNMENT,'=',1,6497) +LexToken(VAR,'tt',1,6498) +LexToken(SEMICOLON,';',1,6500) +LexToken(EOL,'\n',1,6501) +LexToken(VAR,'graphics',1,6514) +LexToken(DOT,'.',1,6522) +LexToken(VAR,'exprs',1,6523) +LexToken(ASSIGNMENT,'=',1,6528) +LexToken(VAR,'label',1,6529) +LexToken(SEMICOLON,';',1,6534) +LexToken(EOL,'\n',1,6535) +LexToken(VAR,'x',1,6548) +LexToken(DOT,'.',1,6549) +LexToken(VAR,'graphics',1,6550) +LexToken(ASSIGNMENT,'=',1,6558) +LexToken(VAR,'graphics',1,6559) +LexToken(SEMICOLON,';',1,6567) +LexToken(EOL,'\n',1,6568) +LexToken(VAR,'x',1,6581) +LexToken(DOT,'.',1,6582) +LexToken(VAR,'model',1,6583) +LexToken(ASSIGNMENT,'=',1,6588) +LexToken(VAR,'model',1,6589) +LexToken(SEMICOLON,';',1,6594) +LexToken(EOL,'\n',1,6595) +LexToken(BREAK,'break',1,6608) +LexToken(EOL,'\n',1,6613) +LexToken(END,'end',1,6622) +LexToken(EOL,'\n',1,6625) +LexToken(EOL,'\n',1,6626) +LexToken(CASE,'case',1,6631) +LexToken(DQSTRING,'"define"',1,6643) +LexToken(THEN,'then',1,6645) +LexToken(EOL,'\n',1,6649) +LexToken(VAR,'model',1,6658) +LexToken(ASSIGNMENT,'=',1,6663) +LexToken(SCICOS_MODEL,'scicos_model',1,6664) +LexToken(OPENBRACKET,'(',1,6676) +LexToken(CLOSEBRACKET,')',1,6677) +LexToken(EOL,'\n',1,6678) +LexToken(VAR,'model',1,6687) +LexToken(DOT,'.',1,6692) +LexToken(VAR,'state',1,6693) +LexToken(ASSIGNMENT,'=',1,6698) +LexToken(VAR,'zeros',1,6699) +LexToken(OPENBRACKET,'(',1,6704) +LexToken(NUMBER,'10',1,6705) +LexToken(COMMA,',',1,6707) +LexToken(NUMBER,'1',1,6708) +LexToken(CLOSEBRACKET,')',1,6709) +LexToken(EOL,'\n',1,6710) +LexToken(VAR,'model',1,6719) +LexToken(DOT,'.',1,6724) +LexToken(VAR,'sim',1,6725) +LexToken(ASSIGNMENT,'=',1,6728) +LexToken(VAR,'list',1,6729) +LexToken(OPENBRACKET,'(',1,6733) +LexToken(DQSTRING,'"PDE"',1,6738) +LexToken(COMMA,',',1,6739) +LexToken(NUMBER,'0',1,6740) +LexToken(CLOSEBRACKET,')',1,6741) +LexToken(EOL,'\n',1,6742) +LexToken(VAR,'model',1,6751) +LexToken(DOT,'.',1,6756) +LexToken(VAR,'in',1,6757) +LexToken(ASSIGNMENT,'=',1,6759) +LexToken(OPENSQBRACKET,'[',1,6760) +LexToken(NUMBER,'1',1,6761) +LexToken(SEMICOLON,';',1,6762) +LexToken(NUMBER,'1',1,6763) +LexToken(SEMICOLON,';',1,6764) +LexToken(NUMBER,'1',1,6765) +LexToken(SEMICOLON,';',1,6766) +LexToken(NUMBER,'1',1,6767) +LexToken(SEMICOLON,';',1,6768) +LexToken(NUMBER,'1',1,6769) +LexToken(CLOSESQBRACKET,']',1,6770) +LexToken(EOL,'\n',1,6771) +LexToken(VAR,'model',1,6780) +LexToken(DOT,'.',1,6785) +LexToken(VAR,'out',1,6786) +LexToken(ASSIGNMENT,'=',1,6789) +LexToken(OPENSQBRACKET,'[',1,6790) +LexToken(NUMBER,'10',1,6791) +LexToken(SEMICOLON,';',1,6793) +LexToken(NUMBER,'0',1,6794) +LexToken(CLOSESQBRACKET,']',1,6795) +LexToken(EOL,'\n',1,6796) +LexToken(VAR,'model',1,6805) +LexToken(DOT,'.',1,6810) +LexToken(VAR,'blocktype',1,6811) +LexToken(ASSIGNMENT,'=',1,6820) +LexToken(DQSTRING,'"c"',1,6823) +LexToken(EOL,'\n',1,6824) +LexToken(VAR,'model',1,6833) +LexToken(DOT,'.',1,6838) +LexToken(VAR,'dep_ut',1,6839) +LexToken(ASSIGNMENT,'=',1,6845) +LexToken(OPENSQBRACKET,'[',1,6846) +LexToken(PREVAR_BOOLEAN,'%f',1,6847) +LexToken(PREVAR_BOOLEAN,'%t',1,6850) +LexToken(CLOSESQBRACKET,']',1,6852) +LexToken(EOL,'\n',1,6853) +LexToken(EOL,'\n',1,6854) +LexToken(EOL,'\n',1,6888) +LexToken(VAR,'params_pde',1,6897) +LexToken(ASSIGNMENT,'=',1,6907) +LexToken(VAR,'tlist',1,6908) +LexToken(OPENBRACKET,'(',1,6913) +LexToken(OPENSQBRACKET,'[',1,6914) +LexToken(DQSTRING,'"paramspde"',1,6925) +LexToken(SEMICOLON,';',1,6926) +LexToken(DQSTRING,'"a"',1,6929) +LexToken(SEMICOLON,';',1,6930) +LexToken(DQSTRING,'"b"',1,6933) +LexToken(SEMICOLON,';',1,6934) +LexToken(DQSTRING,'"txt_exp"',1,6943) +LexToken(SEMICOLON,';',1,6944) +LexToken(DQSTRING,'"check_op1"',1,6955) +LexToken(SEMICOLON,';',1,6956) +LexToken(DQSTRING,'"a1"',1,6960) +LexToken(SEMICOLON,';',1,6961) +LexToken(DQSTRING,'"b1"',1,6965) +LexToken(SEMICOLON,';',1,6966) +LexToken(DQSTRING,'"check_op2"',1,6977) +LexToken(SEMICOLON,';',1,6978) +LexToken(DQSTRING,'"a2"',1,6982) +LexToken(SEMICOLON,';',1,6983) +LexToken(DQSTRING,'"b2"',1,6987) +LexToken(SEMICOLON,';',1,6988) +LexToken(DQSTRING,'"check_op3"',1,7010) +LexToken(SEMICOLON,';',1,7011) +LexToken(DQSTRING,'"a3"',1,7015) +LexToken(SEMICOLON,';',1,7016) +LexToken(DQSTRING,'"b3"',1,7020) +LexToken(SEMICOLON,';',1,7021) +LexToken(DQSTRING,'"check_op4"',1,7032) +LexToken(SEMICOLON,';',1,7033) +LexToken(DQSTRING,'"a4"',1,7037) +LexToken(SEMICOLON,';',1,7038) +LexToken(DQSTRING,'"b4"',1,7042) +LexToken(SEMICOLON,';',1,7043) +LexToken(DQSTRING,'"check_op5"',1,7054) +LexToken(SEMICOLON,';',1,7055) +LexToken(DQSTRING,'"a5"',1,7059) +LexToken(SEMICOLON,';',1,7060) +LexToken(DQSTRING,'"b5"',1,7064) +LexToken(SEMICOLON,';',1,7065) +LexToken(DQSTRING,'"check_op6"',1,7076) +LexToken(SEMICOLON,';',1,7077) +LexToken(DQSTRING,'"a6"',1,7081) +LexToken(SEMICOLON,';',1,7082) +LexToken(DQSTRING,'"b6"',1,7086) +LexToken(SEMICOLON,';',1,7087) +LexToken(DQSTRING,'"check_op7"',1,7109) +LexToken(SEMICOLON,';',1,7110) +LexToken(DQSTRING,'"a7"',1,7114) +LexToken(SEMICOLON,';',1,7115) +LexToken(DQSTRING,'"b7"',1,7119) +LexToken(SEMICOLON,';',1,7120) +LexToken(DQSTRING,'"discr_cst"',1,7131) +LexToken(SEMICOLON,';',1,7132) +LexToken(DQSTRING,'"discr_non_cst"',1,7147) +LexToken(SEMICOLON,';',1,7148) +LexToken(DQSTRING,'"signe"',1,7155) +LexToken(SEMICOLON,';',1,7156) +LexToken(DQSTRING,'"rad_automatique"',1,7173) +LexToken(SEMICOLON,';',1,7174) +LexToken(DQSTRING,'"rad_manuel"',1,7186) +LexToken(SEMICOLON,';',1,7187) +LexToken(DQSTRING,'"methode"',1,7207) +LexToken(SEMICOLON,';',1,7208) +LexToken(DQSTRING,'"ord1"',1,7214) +LexToken(SEMICOLON,';',1,7215) +LexToken(DQSTRING,'"ord2"',1,7221) +LexToken(SEMICOLON,';',1,7222) +LexToken(DQSTRING,'"ord3"',1,7228) +LexToken(SEMICOLON,';',1,7229) +LexToken(DQSTRING,'"degre"',1,7236) +LexToken(SEMICOLON,';',1,7237) +LexToken(DQSTRING,'"nnode"',1,7244) +LexToken(SEMICOLON,';',1,7245) +LexToken(DQSTRING,'"txt_pas"',1,7254) +LexToken(SEMICOLON,';',1,7255) +LexToken(DQSTRING,'"CI"',1,7259) +LexToken(SEMICOLON,';',1,7260) +LexToken(DQSTRING,'"dCI"',1,7265) +LexToken(SEMICOLON,';',1,7266) +LexToken(DQSTRING,'"CLa"',1,7271) +LexToken(SEMICOLON,';',1,7272) +LexToken(DQSTRING,'"CLa_exp"',1,7281) +LexToken(SEMICOLON,';',1,7282) +LexToken(DQSTRING,'"CLb"',1,7287) +LexToken(SEMICOLON,';',1,7288) +LexToken(DQSTRING,'"CLb_exp"',1,7308) +LexToken(SEMICOLON,';',1,7309) +LexToken(DQSTRING,'"points"',1,7317) +LexToken(CLOSESQBRACKET,']',1,7318) LexToken(COMMA,',',1,7319) LexToken(DQSTRING,'""',1,7321) LexToken(COMMA,',',1,7322) LexToken(DQSTRING,'""',1,7324) LexToken(COMMA,',',1,7325) -LexToken(DQSTRING,'"0"',1,7328) -LexToken(COMMA,',',1,7329) -LexToken(DQSTRING,'""',1,7331) +LexToken(DQSTRING,'""',1,7327) +LexToken(COMMA,',',1,7328) +LexToken(DQSTRING,'"0"',1,7331) LexToken(COMMA,',',1,7332) -LexToken(DQSTRING,'"IN_EDP1(t)"',1,7344) -LexToken(COMMA,',',1,7345) -LexToken(DQSTRING,'"0"',1,7348) -LexToken(COMMA,',',1,7349) -LexToken(DQSTRING,'""',1,7351) +LexToken(DQSTRING,'""',1,7334) +LexToken(COMMA,',',1,7335) +LexToken(DQSTRING,'"IN_EDP1(t)"',1,7347) +LexToken(COMMA,',',1,7348) +LexToken(DQSTRING,'"0"',1,7351) LexToken(COMMA,',',1,7352) -LexToken(DQSTRING,'"IN_EDP2(t)"',1,7364) -LexToken(COMMA,',',1,7365) -LexToken(DQSTRING,'"0"',1,7368) -LexToken(COMMA,',',1,7369) -LexToken(DQSTRING,'""',1,7371) +LexToken(DQSTRING,'""',1,7354) +LexToken(COMMA,',',1,7355) +LexToken(DQSTRING,'"IN_EDP2(t)"',1,7367) +LexToken(COMMA,',',1,7368) +LexToken(DQSTRING,'"0"',1,7371) LexToken(COMMA,',',1,7372) -LexToken(DQSTRING,'"IN_EDP3(t)"',1,7384) -LexToken(COMMA,',',1,7385) -LexToken(DQSTRING,'"0"',1,7399) -LexToken(COMMA,',',1,7400) -LexToken(DQSTRING,'""',1,7402) +LexToken(DQSTRING,'""',1,7374) +LexToken(COMMA,',',1,7375) +LexToken(DQSTRING,'"IN_EDP3(t)"',1,7387) +LexToken(COMMA,',',1,7388) +LexToken(DQSTRING,'"0"',1,7402) LexToken(COMMA,',',1,7403) -LexToken(DQSTRING,'"IN_EDP4(t)"',1,7415) -LexToken(COMMA,',',1,7416) -LexToken(DQSTRING,'"0"',1,7419) -LexToken(COMMA,',',1,7420) -LexToken(DQSTRING,'""',1,7422) +LexToken(DQSTRING,'""',1,7405) +LexToken(COMMA,',',1,7406) +LexToken(DQSTRING,'"IN_EDP4(t)"',1,7418) +LexToken(COMMA,',',1,7419) +LexToken(DQSTRING,'"0"',1,7422) LexToken(COMMA,',',1,7423) -LexToken(DQSTRING,'"IN_EDP5(t)"',1,7435) -LexToken(COMMA,',',1,7436) -LexToken(DQSTRING,'"0"',1,7439) -LexToken(COMMA,',',1,7440) -LexToken(DQSTRING,'""',1,7442) +LexToken(DQSTRING,'""',1,7425) +LexToken(COMMA,',',1,7426) +LexToken(DQSTRING,'"IN_EDP5(t)"',1,7438) +LexToken(COMMA,',',1,7439) +LexToken(DQSTRING,'"0"',1,7442) LexToken(COMMA,',',1,7443) -LexToken(DQSTRING,'"IN_EDP6(t)"',1,7455) -LexToken(COMMA,',',1,7456) -LexToken(DQSTRING,'"0"',1,7459) -LexToken(COMMA,',',1,7460) -LexToken(DQSTRING,'""',1,7462) +LexToken(DQSTRING,'""',1,7445) +LexToken(COMMA,',',1,7446) +LexToken(DQSTRING,'"IN_EDP6(t)"',1,7458) +LexToken(COMMA,',',1,7459) +LexToken(DQSTRING,'"0"',1,7462) LexToken(COMMA,',',1,7463) -LexToken(DQSTRING,'"IN_EDP7(t)"',1,7475) -LexToken(COMMA,',',1,7476) -LexToken(DQSTRING,'"0"',1,7479) -LexToken(COMMA,',',1,7480) -LexToken(DQSTRING,'"0"',1,7483) -LexToken(COMMA,',',1,7484) -LexToken(DQSTRING,'"0"',1,7498) -LexToken(COMMA,',',1,7499) -LexToken(DQSTRING,'"0"',1,7502) -LexToken(COMMA,',',1,7503) -LexToken(DQSTRING,'"0"',1,7506) -LexToken(COMMA,',',1,7507) -LexToken(DQSTRING,'"0"',1,7510) -LexToken(COMMA,',',1,7511) -LexToken(DQSTRING,'""',1,7513) +LexToken(DQSTRING,'""',1,7465) +LexToken(COMMA,',',1,7466) +LexToken(DQSTRING,'"IN_EDP7(t)"',1,7478) +LexToken(COMMA,',',1,7479) +LexToken(DQSTRING,'"0"',1,7482) +LexToken(COMMA,',',1,7483) +LexToken(DQSTRING,'"0"',1,7486) +LexToken(COMMA,',',1,7487) +LexToken(DQSTRING,'"0"',1,7501) +LexToken(COMMA,',',1,7502) +LexToken(DQSTRING,'"0"',1,7505) +LexToken(COMMA,',',1,7506) +LexToken(DQSTRING,'"0"',1,7509) +LexToken(COMMA,',',1,7510) +LexToken(DQSTRING,'"0"',1,7513) LexToken(COMMA,',',1,7514) LexToken(DQSTRING,'""',1,7516) LexToken(COMMA,',',1,7517) @@ -1374,56 +1374,58 @@ LexToken(DQSTRING,'""',1,7531) LexToken(COMMA,',',1,7532) LexToken(DQSTRING,'""',1,7534) LexToken(COMMA,',',1,7535) -LexToken(DQSTRING,'"0"',1,7538) -LexToken(COMMA,',',1,7539) -LexToken(DQSTRING,'"IN_CL1(t)"',1,7550) -LexToken(COMMA,',',1,7551) -LexToken(DQSTRING,'"0"',1,7554) -LexToken(COMMA,',',1,7555) -LexToken(DQSTRING,'"IN_CL2(t)"',1,7566) -LexToken(COMMA,',',1,7567) -LexToken(DQSTRING,'""',1,7569) -LexToken(CLOSEBRACKET,')',1,7570) -LexToken(SEMICOLON,';',1,7571) -LexToken(EOL,'\n',1,7572) -LexToken(EOL,'\n',1,7650) -LexToken(VAR,'label',1,7659) -LexToken(ASSIGNMENT,'=',1,7664) -LexToken(VAR,'list',1,7665) -LexToken(OPENBRACKET,'(',1,7669) -LexToken(VAR,'params_pde',1,7670) -LexToken(COMMA,',',1,7680) -LexToken(OPENSQBRACKET,'[',1,7681) -LexToken(CLOSESQBRACKET,']',1,7682) +LexToken(DQSTRING,'""',1,7537) +LexToken(COMMA,',',1,7538) +LexToken(DQSTRING,'"0"',1,7541) +LexToken(COMMA,',',1,7542) +LexToken(DQSTRING,'"IN_CL1(t)"',1,7553) +LexToken(COMMA,',',1,7554) +LexToken(DQSTRING,'"0"',1,7557) +LexToken(COMMA,',',1,7558) +LexToken(DQSTRING,'"IN_CL2(t)"',1,7569) +LexToken(COMMA,',',1,7570) +LexToken(DQSTRING,'""',1,7572) +LexToken(CLOSEBRACKET,')',1,7573) +LexToken(SEMICOLON,';',1,7574) +LexToken(EOL,'\n',1,7575) +LexToken(EOL,'\n',1,7653) +LexToken(VAR,'label',1,7662) +LexToken(ASSIGNMENT,'=',1,7667) +LexToken(VAR,'list',1,7668) +LexToken(OPENBRACKET,'(',1,7672) +LexToken(VAR,'params_pde',1,7673) LexToken(COMMA,',',1,7683) -LexToken(DQSTRING,'""',1,7685) -LexToken(CLOSEBRACKET,')',1,7686) -LexToken(SEMICOLON,';',1,7687) -LexToken(EOL,'\n',1,7688) -LexToken(VAR,'gr_i',1,7697) -LexToken(ASSIGNMENT,'=',1,7701) -LexToken(OPENSQBRACKET,'[',1,7702) -LexToken(CLOSESQBRACKET,']',1,7703) -LexToken(EOL,'\n',1,7704) -LexToken(VAR,'x',1,7713) -LexToken(ASSIGNMENT,'=',1,7714) -LexToken(VAR,'standard_define',1,7715) -LexToken(OPENBRACKET,'(',1,7730) -LexToken(OPENSQBRACKET,'[',1,7731) -LexToken(NUMBER,'3',1,7732) -LexToken(NUMBER,'3',1,7734) -LexToken(CLOSESQBRACKET,']',1,7735) -LexToken(COMMA,',',1,7736) -LexToken(VAR,'model',1,7737) -LexToken(COMMA,',',1,7742) -LexToken(VAR,'label',1,7743) -LexToken(COMMA,',',1,7748) -LexToken(VAR,'gr_i',1,7749) -LexToken(CLOSEBRACKET,')',1,7753) -LexToken(EOL,'\n',1,7754) -LexToken(EOL,'\n',1,7755) -LexToken(END,'end',1,7760) -LexToken(EOL,'\n',1,7763) -LexToken(ENDFUNCTION,'endfunction',1,7764) -LexToken(EOL,'\n',1,7775) -LexToken(EOL,'\n',1,7776) +LexToken(OPENSQBRACKET,'[',1,7684) +LexToken(CLOSESQBRACKET,']',1,7685) +LexToken(COMMA,',',1,7686) +LexToken(DQSTRING,'""',1,7688) +LexToken(CLOSEBRACKET,')',1,7689) +LexToken(SEMICOLON,';',1,7690) +LexToken(EOL,'\n',1,7691) +LexToken(VAR,'gr_i',1,7700) +LexToken(ASSIGNMENT,'=',1,7704) +LexToken(OPENSQBRACKET,'[',1,7705) +LexToken(CLOSESQBRACKET,']',1,7706) +LexToken(EOL,'\n',1,7707) +LexToken(VAR,'x',1,7716) +LexToken(ASSIGNMENT,'=',1,7717) +LexToken(VAR,'standard_define',1,7718) +LexToken(OPENBRACKET,'(',1,7733) +LexToken(OPENSQBRACKET,'[',1,7734) +LexToken(NUMBER,'3',1,7735) +LexToken(NUMBER,'3',1,7737) +LexToken(CLOSESQBRACKET,']',1,7738) +LexToken(COMMA,',',1,7739) +LexToken(VAR,'model',1,7740) +LexToken(COMMA,',',1,7745) +LexToken(VAR,'label',1,7746) +LexToken(COMMA,',',1,7751) +LexToken(VAR,'gr_i',1,7752) +LexToken(CLOSEBRACKET,')',1,7756) +LexToken(EOL,'\n',1,7757) +LexToken(EOL,'\n',1,7758) +LexToken(END,'end',1,7763) +LexToken(EOL,'\n',1,7766) +LexToken(ENDFUNCTION,'endfunction',1,7767) +LexToken(EOL,'\n',1,7778) +LexToken(EOL,'\n',1,7779) diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 03ac487a..64a02333 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -392,7 +392,7 @@ LexToken(COMMA,',',1,3064) LexToken(VAR,'ones',1,3066) LexToken(OPENBRACKET,'(',1,3070) LexToken(NUMBER,'1',1,3071) -LexToken(OPERATOR,'-',1,3072) +LexToken(ADDITION,'-',1,3072) LexToken(VAR,'herit',1,3073) LexToken(COMMA,',',1,3078) LexToken(NUMBER,'1',1,3079) @@ -438,7 +438,8 @@ LexToken(DOT,'.',1,3213) LexToken(VAR,'dstate',1,3214) LexToken(ASSIGNMENT,'=',1,3221) LexToken(OPENSQBRACKET,'[',1,3223) -LexToken(NUMBER,'-1',1,3224) +LexToken(ADDITION,'-',1,3224) +LexToken(NUMBER,'1',1,3225) LexToken(SEMICOLON,';',1,3226) LexToken(NUMBER,'0',1,3227) LexToken(SEMICOLON,';',1,3228) @@ -458,7 +459,7 @@ LexToken(NUMBER,'1',1,3246) LexToken(COMMA,',',1,3247) LexToken(NUMBER,'1',1,3248) LexToken(CLOSEBRACKET,')',1,3249) -LexToken(OPERATOR,'*',1,3250) +LexToken(MULTIPLICATION,'*',1,3250) LexToken(VAR,'in',1,3251) LexToken(OPENBRACKET,'(',1,3253) LexToken(NUMBER,'1',1,3254) @@ -477,7 +478,7 @@ LexToken(ASSIGNMENT,'=',1,3291) LexToken(VAR,'ones',1,3293) LexToken(OPENBRACKET,'(',1,3297) LexToken(NUMBER,'1',1,3298) -LexToken(OPERATOR,'-',1,3299) +LexToken(ADDITION,'-',1,3299) LexToken(VAR,'herit',1,3300) LexToken(COMMA,',',1,3305) LexToken(NUMBER,'1',1,3306) @@ -600,7 +601,8 @@ LexToken(DOT,'.',1,3772) LexToken(VAR,'dstate',1,3773) LexToken(ASSIGNMENT,'=',1,3780) LexToken(OPENSQBRACKET,'[',1,3782) -LexToken(NUMBER,'-1',1,3783) +LexToken(ADDITION,'-',1,3783) +LexToken(NUMBER,'1',1,3784) LexToken(SEMICOLON,';',1,3785) LexToken(NUMBER,'0',1,3786) LexToken(SEMICOLON,';',1,3787) @@ -620,7 +622,7 @@ LexToken(NUMBER,'1',1,3805) LexToken(COMMA,',',1,3806) LexToken(NUMBER,'1',1,3807) LexToken(CLOSEBRACKET,')',1,3808) -LexToken(OPERATOR,'*',1,3809) +LexToken(MULTIPLICATION,'*',1,3809) LexToken(VAR,'in',1,3810) LexToken(OPENBRACKET,'(',1,3812) LexToken(NUMBER,'1',1,3813) diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index b815911b..4eb60cc8 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -292,7 +292,8 @@ LexToken(SEMICOLON,';',1,1768) LexToken(EOL,'\n',1,1769) LexToken(VAR,'xmin',1,1778) LexToken(ASSIGNMENT,'=',1,1783) -LexToken(NUMBER,'-15',1,1785) +LexToken(ADDITION,'-',1,1785) +LexToken(NUMBER,'15',1,1786) LexToken(SEMICOLON,';',1,1788) LexToken(EOL,'\n',1,1789) LexToken(VAR,'xmax',1,1798) @@ -302,7 +303,8 @@ LexToken(SEMICOLON,';',1,1807) LexToken(EOL,'\n',1,1808) LexToken(VAR,'ymin',1,1817) LexToken(ASSIGNMENT,'=',1,1822) -LexToken(NUMBER,'-15',1,1824) +LexToken(ADDITION,'-',1,1824) +LexToken(NUMBER,'15',1,1825) LexToken(SEMICOLON,';',1,1827) LexToken(EOL,'\n',1,1828) LexToken(VAR,'ymax',1,1837) @@ -343,9 +345,11 @@ LexToken(DOT,'.',1,1959) LexToken(VAR,'in',1,1960) LexToken(ASSIGNMENT,'=',1,1962) LexToken(OPENSQBRACKET,'[',1,1963) -LexToken(NUMBER,'-1',1,1964) +LexToken(ADDITION,'-',1,1964) +LexToken(NUMBER,'1',1,1965) LexToken(SEMICOLON,';',1,1966) -LexToken(NUMBER,'-1',1,1967) +LexToken(ADDITION,'-',1,1967) +LexToken(NUMBER,'1',1,1968) LexToken(CLOSESQBRACKET,']',1,1969) LexToken(SEMICOLON,';',1,1970) LexToken(EOL,'\n',1,1971) diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 85d61b9c..8efafe7c 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -170,11 +170,13 @@ LexToken(NUMBER,'1',1,1667) LexToken(COMMA,',',1,1668) LexToken(DQSTRING,'"vec"',1,1673) LexToken(COMMA,',',1,1674) -LexToken(NUMBER,'-1',1,1675) +LexToken(ADDITION,'-',1,1675) +LexToken(NUMBER,'1',1,1676) LexToken(COMMA,',',1,1677) LexToken(DQSTRING,'"vec"',1,1682) LexToken(COMMA,',',1,1683) -LexToken(NUMBER,'-1',1,1684) +LexToken(ADDITION,'-',1,1684) +LexToken(NUMBER,'1',1,1685) LexToken(COMMA,',',1,1686) LexToken(DQSTRING,'"vec"',1,1691) LexToken(COMMA,',',1,1692) @@ -291,7 +293,8 @@ LexToken(EOL,'\n',1,2195) LexToken(IF,'if',1,2208) LexToken(VAR,'win',1,2211) LexToken(COMPARISON,'<',1,2214) -LexToken(NUMBER,'-1',1,2215) +LexToken(ADDITION,'-',1,2215) +LexToken(NUMBER,'1',1,2216) LexToken(THEN,'then',1,2218) LexToken(EOL,'\n',1,2222) LexToken(VAR,'mess',1,2239) @@ -439,7 +442,7 @@ LexToken(EOL,'\n',1,3088) LexToken(VAR,'in',1,3105) LexToken(ASSIGNMENT,'=',1,3108) LexToken(VAR,'nbr_curves',1,3110) -LexToken(OPERATOR,'*',1,3120) +LexToken(MULTIPLICATION,'*',1,3120) LexToken(VAR,'ones',1,3121) LexToken(OPENBRACKET,'(',1,3125) LexToken(NUMBER,'2',1,3126) @@ -513,9 +516,11 @@ LexToken(EOL,'\n',1,3302) LexToken(VAR,'wpos',1,3323) LexToken(ASSIGNMENT,'=',1,3327) LexToken(OPENSQBRACKET,'[',1,3328) -LexToken(NUMBER,'-1',1,3329) +LexToken(ADDITION,'-',1,3329) +LexToken(NUMBER,'1',1,3330) LexToken(SEMICOLON,';',1,3331) -LexToken(NUMBER,'-1',1,3332) +LexToken(ADDITION,'-',1,3332) +LexToken(NUMBER,'1',1,3333) LexToken(CLOSESQBRACKET,']',1,3334) LexToken(SEMICOLON,';',1,3335) LexToken(EOL,'\n',1,3336) @@ -531,9 +536,11 @@ LexToken(EOL,'\n',1,3389) LexToken(VAR,'wdim',1,3410) LexToken(ASSIGNMENT,'=',1,3414) LexToken(OPENSQBRACKET,'[',1,3415) -LexToken(NUMBER,'-1',1,3416) +LexToken(ADDITION,'-',1,3416) +LexToken(NUMBER,'1',1,3417) LexToken(SEMICOLON,';',1,3418) -LexToken(NUMBER,'-1',1,3419) +LexToken(ADDITION,'-',1,3419) +LexToken(NUMBER,'1',1,3420) LexToken(CLOSESQBRACKET,']',1,3421) LexToken(SEMICOLON,';',1,3422) LexToken(EOL,'\n',1,3423) @@ -626,12 +633,14 @@ LexToken(THEN,'then',1,3911) LexToken(EOL,'\n',1,3915) LexToken(VAR,'win',1,3924) LexToken(ASSIGNMENT,'=',1,3927) -LexToken(NUMBER,'-1',1,3928) +LexToken(ADDITION,'-',1,3928) +LexToken(NUMBER,'1',1,3929) LexToken(SEMICOLON,';',1,3930) LexToken(EOL,'\n',1,3931) LexToken(VAR,'clrs',1,3940) LexToken(ASSIGNMENT,'=',1,3944) -LexToken(NUMBER,'-4',1,3945) +LexToken(ADDITION,'-',1,3945) +LexToken(NUMBER,'4',1,3946) LexToken(SEMICOLON,';',1,3947) LexToken(EOL,'\n',1,3948) LexToken(VAR,'N',1,3957) @@ -647,24 +656,29 @@ LexToken(EOL,'\n',1,3976) LexToken(VAR,'wpos',1,3985) LexToken(ASSIGNMENT,'=',1,3989) LexToken(OPENSQBRACKET,'[',1,3990) -LexToken(NUMBER,'-1',1,3991) +LexToken(ADDITION,'-',1,3991) +LexToken(NUMBER,'1',1,3992) LexToken(SEMICOLON,';',1,3993) -LexToken(NUMBER,'-1',1,3994) +LexToken(ADDITION,'-',1,3994) +LexToken(NUMBER,'1',1,3995) LexToken(CLOSESQBRACKET,']',1,3996) LexToken(SEMICOLON,';',1,3997) LexToken(EOL,'\n',1,3998) LexToken(VAR,'wdim',1,4007) LexToken(ASSIGNMENT,'=',1,4011) LexToken(OPENSQBRACKET,'[',1,4012) -LexToken(NUMBER,'-1',1,4013) +LexToken(ADDITION,'-',1,4013) +LexToken(NUMBER,'1',1,4014) LexToken(SEMICOLON,';',1,4015) -LexToken(NUMBER,'-1',1,4016) +LexToken(ADDITION,'-',1,4016) +LexToken(NUMBER,'1',1,4017) LexToken(CLOSESQBRACKET,']',1,4018) LexToken(SEMICOLON,';',1,4019) LexToken(EOL,'\n',1,4020) LexToken(VAR,'xmin',1,4029) LexToken(ASSIGNMENT,'=',1,4033) -LexToken(NUMBER,'-15',1,4034) +LexToken(ADDITION,'-',1,4034) +LexToken(NUMBER,'15',1,4035) LexToken(SEMICOLON,';',1,4037) LexToken(EOL,'\n',1,4038) LexToken(VAR,'xmax',1,4047) @@ -674,12 +688,13 @@ LexToken(SEMICOLON,';',1,4054) LexToken(EOL,'\n',1,4055) LexToken(VAR,'ymin',1,4064) LexToken(ASSIGNMENT,'=',1,4068) -LexToken(NUMBER,'-15',1,4069) +LexToken(ADDITION,'-',1,4069) +LexToken(NUMBER,'15',1,4070) LexToken(SEMICOLON,';',1,4072) LexToken(EOL,'\n',1,4073) LexToken(VAR,'ymax',1,4082) LexToken(ASSIGNMENT,'=',1,4086) -LexToken(OPERATOR,'+',1,4087) +LexToken(ADDITION,'+',1,4087) LexToken(NUMBER,'15',1,4088) LexToken(EOL,'\n',1,4090) LexToken(VAR,'nbr_curves',1,4099) diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 5508cac4..fb51406f 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -156,11 +156,13 @@ LexToken(NUMBER,'1',1,1659) LexToken(COMMA,',',1,1660) LexToken(DQSTRING,'"vec"',1,1665) LexToken(COMMA,',',1,1666) -LexToken(NUMBER,'-1',1,1667) +LexToken(ADDITION,'-',1,1667) +LexToken(NUMBER,'1',1,1668) LexToken(COMMA,',',1,1669) LexToken(DQSTRING,'"vec"',1,1674) LexToken(COMMA,',',1,1675) -LexToken(NUMBER,'-1',1,1676) +LexToken(ADDITION,'-',1,1676) +LexToken(NUMBER,'1',1,1677) LexToken(COMMA,',',1,1678) LexToken(DQSTRING,'"vec"',1,1683) LexToken(COMMA,',',1,1684) @@ -168,27 +170,33 @@ LexToken(NUMBER,'1',1,1685) LexToken(COMMA,',',1,1686) LexToken(DQSTRING,'"vec"',1,1691) LexToken(COMMA,',',1,1692) -LexToken(NUMBER,'-1',1,1693) +LexToken(ADDITION,'-',1,1693) +LexToken(NUMBER,'1',1,1694) LexToken(COMMA,',',1,1695) LexToken(DQSTRING,'"vec"',1,1700) LexToken(COMMA,',',1,1701) -LexToken(NUMBER,'-1',1,1702) +LexToken(ADDITION,'-',1,1702) +LexToken(NUMBER,'1',1,1703) LexToken(COMMA,',',1,1704) LexToken(DQSTRING,'"vec"',1,1709) LexToken(COMMA,',',1,1710) -LexToken(NUMBER,'-1',1,1711) +LexToken(ADDITION,'-',1,1711) +LexToken(NUMBER,'1',1,1712) LexToken(COMMA,',',1,1713) LexToken(DQSTRING,'"vec"',1,1718) LexToken(COMMA,',',1,1719) -LexToken(NUMBER,'-1',1,1720) +LexToken(ADDITION,'-',1,1720) +LexToken(NUMBER,'1',1,1721) LexToken(COMMA,',',1,1722) LexToken(DQSTRING,'"vec"',1,1727) LexToken(COMMA,',',1,1728) -LexToken(NUMBER,'-1',1,1729) +LexToken(ADDITION,'-',1,1729) +LexToken(NUMBER,'1',1,1730) LexToken(COMMA,',',1,1731) LexToken(DQSTRING,'"vec"',1,1736) LexToken(COMMA,',',1,1737) -LexToken(NUMBER,'-1',1,1738) +LexToken(ADDITION,'-',1,1738) +LexToken(NUMBER,'1',1,1739) LexToken(COMMA,',',1,1740) LexToken(DQSTRING,'"vec"',1,1745) LexToken(COMMA,',',1,1746) @@ -288,7 +296,8 @@ LexToken(EOL,'\n',1,2201) LexToken(IF,'if',1,2214) LexToken(VAR,'win',1,2217) LexToken(COMPARISON,'<',1,2220) -LexToken(NUMBER,'-1',1,2221) +LexToken(ADDITION,'-',1,2221) +LexToken(NUMBER,'1',1,2222) LexToken(THEN,'then',1,2224) LexToken(EOL,'\n',1,2228) LexToken(VAR,'mess',1,2245) @@ -550,7 +559,7 @@ LexToken(EOL,'\n',1,3741) LexToken(VAR,'in',1,3758) LexToken(ASSIGNMENT,'=',1,3761) LexToken(VAR,'nbr_curves',1,3763) -LexToken(OPERATOR,'*',1,3773) +LexToken(MULTIPLICATION,'*',1,3773) LexToken(VAR,'ones',1,3774) LexToken(OPENBRACKET,'(',1,3778) LexToken(NUMBER,'3',1,3779) @@ -624,9 +633,11 @@ LexToken(EOL,'\n',1,3955) LexToken(VAR,'wpos',1,3976) LexToken(ASSIGNMENT,'=',1,3980) LexToken(OPENSQBRACKET,'[',1,3981) -LexToken(NUMBER,'-1',1,3982) +LexToken(ADDITION,'-',1,3982) +LexToken(NUMBER,'1',1,3983) LexToken(SEMICOLON,';',1,3984) -LexToken(NUMBER,'-1',1,3985) +LexToken(ADDITION,'-',1,3985) +LexToken(NUMBER,'1',1,3986) LexToken(CLOSESQBRACKET,']',1,3987) LexToken(SEMICOLON,';',1,3988) LexToken(EOL,'\n',1,3989) @@ -642,9 +653,11 @@ LexToken(EOL,'\n',1,4042) LexToken(VAR,'wdim',1,4063) LexToken(ASSIGNMENT,'=',1,4067) LexToken(OPENSQBRACKET,'[',1,4068) -LexToken(NUMBER,'-1',1,4069) +LexToken(ADDITION,'-',1,4069) +LexToken(NUMBER,'1',1,4070) LexToken(SEMICOLON,';',1,4071) -LexToken(NUMBER,'-1',1,4072) +LexToken(ADDITION,'-',1,4072) +LexToken(NUMBER,'1',1,4073) LexToken(CLOSESQBRACKET,']',1,4074) LexToken(SEMICOLON,';',1,4075) LexToken(EOL,'\n',1,4076) @@ -763,7 +776,8 @@ LexToken(THEN,'then',1,4521) LexToken(EOL,'\n',1,4525) LexToken(VAR,'win',1,4534) LexToken(ASSIGNMENT,'=',1,4537) -LexToken(NUMBER,'-1',1,4538) +LexToken(ADDITION,'-',1,4538) +LexToken(NUMBER,'1',1,4539) LexToken(SEMICOLON,';',1,4540) LexToken(EOL,'\n',1,4541) LexToken(VAR,'N',1,4550) @@ -814,18 +828,22 @@ LexToken(EOL,'\n',1,4620) LexToken(VAR,'wpos',1,4629) LexToken(ASSIGNMENT,'=',1,4633) LexToken(OPENSQBRACKET,'[',1,4634) -LexToken(NUMBER,'-1',1,4635) +LexToken(ADDITION,'-',1,4635) +LexToken(NUMBER,'1',1,4636) LexToken(SEMICOLON,';',1,4637) -LexToken(NUMBER,'-1',1,4638) +LexToken(ADDITION,'-',1,4638) +LexToken(NUMBER,'1',1,4639) LexToken(CLOSESQBRACKET,']',1,4640) LexToken(SEMICOLON,';',1,4641) LexToken(EOL,'\n',1,4642) LexToken(VAR,'wdim',1,4651) LexToken(ASSIGNMENT,'=',1,4655) LexToken(OPENSQBRACKET,'[',1,4656) -LexToken(NUMBER,'-1',1,4657) +LexToken(ADDITION,'-',1,4657) +LexToken(NUMBER,'1',1,4658) LexToken(SEMICOLON,';',1,4659) -LexToken(NUMBER,'-1',1,4660) +LexToken(ADDITION,'-',1,4660) +LexToken(NUMBER,'1',1,4661) LexToken(CLOSESQBRACKET,']',1,4662) LexToken(SEMICOLON,';',1,4663) LexToken(EOL,'\n',1,4664) @@ -840,7 +858,8 @@ LexToken(EOL,'\n',1,4690) LexToken(VAR,'vec_x',1,4699) LexToken(ASSIGNMENT,'=',1,4705) LexToken(OPENSQBRACKET,'[',1,4707) -LexToken(NUMBER,'-15',1,4708) +LexToken(ADDITION,'-',1,4708) +LexToken(NUMBER,'15',1,4709) LexToken(SEMICOLON,';',1,4711) LexToken(NUMBER,'15',1,4712) LexToken(CLOSESQBRACKET,']',1,4714) @@ -848,7 +867,8 @@ LexToken(EOL,'\n',1,4715) LexToken(VAR,'vec_y',1,4724) LexToken(ASSIGNMENT,'=',1,4730) LexToken(OPENSQBRACKET,'[',1,4732) -LexToken(NUMBER,'-15',1,4733) +LexToken(ADDITION,'-',1,4733) +LexToken(NUMBER,'15',1,4734) LexToken(SEMICOLON,';',1,4736) LexToken(NUMBER,'15',1,4737) LexToken(CLOSESQBRACKET,']',1,4739) @@ -856,7 +876,8 @@ LexToken(EOL,'\n',1,4740) LexToken(VAR,'vec_z',1,4749) LexToken(ASSIGNMENT,'=',1,4755) LexToken(OPENSQBRACKET,'[',1,4757) -LexToken(NUMBER,'-15',1,4758) +LexToken(ADDITION,'-',1,4758) +LexToken(NUMBER,'15',1,4759) LexToken(SEMICOLON,';',1,4761) LexToken(NUMBER,'15',1,4762) LexToken(CLOSESQBRACKET,']',1,4764) diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index d31c4a8a..c6911475 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -135,7 +135,8 @@ LexToken(NUMBER,'1',1,1444) LexToken(COMMA,',',1,1445) LexToken(DQSTRING,'"vec"',1,1450) LexToken(COMMA,',',1,1451) -LexToken(NUMBER,'-1',1,1452) +LexToken(ADDITION,'-',1,1452) +LexToken(NUMBER,'1',1,1453) LexToken(COMMA,',',1,1454) LexToken(DQSTRING,'"vec"',1,1459) LexToken(COMMA,',',1,1460) @@ -143,11 +144,13 @@ LexToken(NUMBER,'1',1,1461) LexToken(COMMA,',',1,1462) LexToken(DQSTRING,'"vec"',1,1467) LexToken(COMMA,',',1,1468) -LexToken(NUMBER,'-1',1,1469) +LexToken(ADDITION,'-',1,1469) +LexToken(NUMBER,'1',1,1470) LexToken(COMMA,',',1,1471) LexToken(DQSTRING,'"vec"',1,1476) LexToken(COMMA,',',1,1477) -LexToken(NUMBER,'-1',1,1478) +LexToken(ADDITION,'-',1,1478) +LexToken(NUMBER,'1',1,1479) LexToken(COMMA,',',1,1480) LexToken(DQSTRING,'"vec"',1,1485) LexToken(COMMA,',',1,1486) @@ -319,7 +322,8 @@ LexToken(EOL,'\n',1,2338) LexToken(IF,'if',1,2351) LexToken(VAR,'win',1,2354) LexToken(COMPARISON,'<',1,2357) -LexToken(NUMBER,'-1',1,2358) +LexToken(ADDITION,'-',1,2358) +LexToken(NUMBER,'1',1,2359) LexToken(THEN,'then',1,2361) LexToken(EOL,'\n',1,2365) LexToken(VAR,'mess',1,2382) @@ -426,9 +430,11 @@ LexToken(EOL,'\n',1,2907) LexToken(VAR,'wpos',1,2928) LexToken(ASSIGNMENT,'=',1,2932) LexToken(OPENSQBRACKET,'[',1,2933) -LexToken(NUMBER,'-1',1,2934) +LexToken(ADDITION,'-',1,2934) +LexToken(NUMBER,'1',1,2935) LexToken(SEMICOLON,';',1,2936) -LexToken(NUMBER,'-1',1,2937) +LexToken(ADDITION,'-',1,2937) +LexToken(NUMBER,'1',1,2938) LexToken(CLOSESQBRACKET,']',1,2939) LexToken(SEMICOLON,';',1,2940) LexToken(EOL,'\n',1,2941) @@ -444,9 +450,11 @@ LexToken(EOL,'\n',1,2994) LexToken(VAR,'wdim',1,3015) LexToken(ASSIGNMENT,'=',1,3019) LexToken(OPENSQBRACKET,'[',1,3020) -LexToken(NUMBER,'-1',1,3021) +LexToken(ADDITION,'-',1,3021) +LexToken(NUMBER,'1',1,3022) LexToken(SEMICOLON,';',1,3023) -LexToken(NUMBER,'-1',1,3024) +LexToken(ADDITION,'-',1,3024) +LexToken(NUMBER,'1',1,3025) LexToken(CLOSESQBRACKET,']',1,3026) LexToken(SEMICOLON,';',1,3027) LexToken(EOL,'\n',1,3028) @@ -528,7 +536,8 @@ LexToken(NUMBER,'1',1,3385) LexToken(EOL,'\n',1,3386) LexToken(VAR,'win',1,3395) LexToken(ASSIGNMENT,'=',1,3398) -LexToken(NUMBER,'-1',1,3399) +LexToken(ADDITION,'-',1,3399) +LexToken(NUMBER,'1',1,3400) LexToken(SEMICOLON,';',1,3401) LexToken(EOL,'\n',1,3402) LexToken(VAR,'clrs',1,3411) @@ -563,9 +572,11 @@ LexToken(EOL,'\n',1,3460) LexToken(VAR,'wpos',1,3469) LexToken(ASSIGNMENT,'=',1,3473) LexToken(OPENSQBRACKET,'[',1,3474) -LexToken(NUMBER,'-1',1,3475) +LexToken(ADDITION,'-',1,3475) +LexToken(NUMBER,'1',1,3476) LexToken(SEMICOLON,';',1,3477) -LexToken(NUMBER,'-1',1,3478) +LexToken(ADDITION,'-',1,3478) +LexToken(NUMBER,'1',1,3479) LexToken(CLOSESQBRACKET,']',1,3480) LexToken(EOL,'\n',1,3481) LexToken(VAR,'per',1,3490) diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 6f0a9b33..edb77239 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -152,11 +152,13 @@ LexToken(NUMBER,'1',1,1556) LexToken(COMMA,',',1,1557) LexToken(DQSTRING,'"vec"',1,1562) LexToken(COMMA,',',1,1563) -LexToken(NUMBER,'-1',1,1564) +LexToken(ADDITION,'-',1,1564) +LexToken(NUMBER,'1',1,1565) LexToken(COMMA,',',1,1566) LexToken(DQSTRING,'"vec"',1,1571) LexToken(COMMA,',',1,1572) -LexToken(NUMBER,'-1',1,1573) +LexToken(ADDITION,'-',1,1573) +LexToken(NUMBER,'1',1,1574) LexToken(COMMA,',',1,1575) LexToken(DQSTRING,'"vec"',1,1580) LexToken(COMMA,',',1,1581) @@ -176,7 +178,8 @@ LexToken(NUMBER,'1',1,1621) LexToken(COMMA,',',1,1622) LexToken(DQSTRING,'"vec"',1,1627) LexToken(COMMA,',',1,1628) -LexToken(NUMBER,'-1',1,1629) +LexToken(ADDITION,'-',1,1629) +LexToken(NUMBER,'1',1,1630) LexToken(CLOSEBRACKET,')',1,1631) LexToken(COMMA,',',1,1632) LexToken(VAR,'exprs',1,1648) @@ -272,7 +275,8 @@ LexToken(EOL,'\n',1,2099) LexToken(IF,'if',1,2112) LexToken(VAR,'win',1,2115) LexToken(COMPARISON,'<',1,2118) -LexToken(NUMBER,'-1',1,2119) +LexToken(ADDITION,'-',1,2119) +LexToken(NUMBER,'1',1,2120) LexToken(THEN,'then',1,2122) LexToken(EOL,'\n',1,2126) LexToken(VAR,'mess',1,2143) @@ -411,9 +415,11 @@ LexToken(EOL,'\n',1,2949) LexToken(VAR,'wpos',1,2970) LexToken(ASSIGNMENT,'=',1,2974) LexToken(OPENSQBRACKET,'[',1,2975) -LexToken(NUMBER,'-1',1,2976) +LexToken(ADDITION,'-',1,2976) +LexToken(NUMBER,'1',1,2977) LexToken(SEMICOLON,';',1,2978) -LexToken(NUMBER,'-1',1,2979) +LexToken(ADDITION,'-',1,2979) +LexToken(NUMBER,'1',1,2980) LexToken(CLOSESQBRACKET,']',1,2981) LexToken(SEMICOLON,';',1,2982) LexToken(EOL,'\n',1,2983) @@ -429,9 +435,11 @@ LexToken(EOL,'\n',1,3036) LexToken(VAR,'wdim',1,3057) LexToken(ASSIGNMENT,'=',1,3061) LexToken(OPENSQBRACKET,'[',1,3062) -LexToken(NUMBER,'-1',1,3063) +LexToken(ADDITION,'-',1,3063) +LexToken(NUMBER,'1',1,3064) LexToken(SEMICOLON,';',1,3065) -LexToken(NUMBER,'-1',1,3066) +LexToken(ADDITION,'-',1,3066) +LexToken(NUMBER,'1',1,3067) LexToken(CLOSESQBRACKET,']',1,3068) LexToken(SEMICOLON,';',1,3069) LexToken(EOL,'\n',1,3070) @@ -593,7 +601,8 @@ LexToken(THEN,'then',1,3856) LexToken(EOL,'\n',1,3860) LexToken(VAR,'win',1,3869) LexToken(ASSIGNMENT,'=',1,3872) -LexToken(NUMBER,'-1',1,3873) +LexToken(ADDITION,'-',1,3873) +LexToken(NUMBER,'1',1,3874) LexToken(SEMICOLON,';',1,3875) LexToken(EOL,'\n',1,3876) LexToken(VAR,'wdim',1,3885) @@ -607,9 +616,11 @@ LexToken(EOL,'\n',1,3899) LexToken(VAR,'wpos',1,3908) LexToken(ASSIGNMENT,'=',1,3912) LexToken(OPENSQBRACKET,'[',1,3913) -LexToken(NUMBER,'-1',1,3914) +LexToken(ADDITION,'-',1,3914) +LexToken(NUMBER,'1',1,3915) LexToken(SEMICOLON,';',1,3916) -LexToken(NUMBER,'-1',1,3917) +LexToken(ADDITION,'-',1,3917) +LexToken(NUMBER,'1',1,3918) LexToken(CLOSESQBRACKET,']',1,3919) LexToken(EOL,'\n',1,3920) LexToken(VAR,'clrs',1,3929) @@ -640,12 +651,13 @@ LexToken(SEMICOLON,';',1,3967) LexToken(EOL,'\n',1,3968) LexToken(VAR,'ymin',1,3977) LexToken(ASSIGNMENT,'=',1,3981) -LexToken(NUMBER,'-15',1,3982) +LexToken(ADDITION,'-',1,3982) +LexToken(NUMBER,'15',1,3983) LexToken(SEMICOLON,';',1,3985) LexToken(EOL,'\n',1,3986) LexToken(VAR,'ymax',1,3995) LexToken(ASSIGNMENT,'=',1,3999) -LexToken(OPERATOR,'+',1,4000) +LexToken(ADDITION,'+',1,4000) LexToken(NUMBER,'15',1,4001) LexToken(SEMICOLON,';',1,4003) LexToken(EOL,'\n',1,4004) diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index bedbd5ef..6e3d5fd7 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -123,7 +123,8 @@ LexToken(DQSTRING,'"pattern"',1,1229) LexToken(COMMA,',',1,1230) LexToken(VAR,'default_color',1,1231) LexToken(OPENBRACKET,'(',1,1244) -LexToken(NUMBER,'-1',1,1245) +LexToken(ADDITION,'-',1,1245) +LexToken(NUMBER,'1',1,1246) LexToken(CLOSEBRACKET,')',1,1247) LexToken(CLOSEBRACKET,')',1,1248) LexToken(SEMICOLON,';',1,1249) @@ -150,15 +151,15 @@ LexToken(VAR,'orig',1,1323) LexToken(OPENBRACKET,'(',1,1327) LexToken(NUMBER,'1',1,1328) LexToken(CLOSEBRACKET,')',1,1329) -LexToken(OPERATOR,'+',1,1330) +LexToken(ADDITION,'+',1,1330) LexToken(VAR,'sz',1,1331) LexToken(OPENBRACKET,'(',1,1333) LexToken(NUMBER,'1',1,1334) LexToken(CLOSEBRACKET,')',1,1335) -LexToken(OPERATOR,'*',1,1336) +LexToken(MULTIPLICATION,'*',1,1336) LexToken(OPENSQBRACKET,'[',1,1337) LexToken(NUMBER,'1',1,1338) -LexToken(OPERATOR,'/',1,1339) +LexToken(MULTIPLICATION,'/',1,1339) LexToken(NUMBER,'2',1,1340) LexToken(SEMICOLON,';',1,1341) LexToken(NUMBER,'1',1,1342) @@ -177,17 +178,17 @@ LexToken(VAR,'orig',1,1366) LexToken(OPENBRACKET,'(',1,1370) LexToken(NUMBER,'2',1,1371) LexToken(CLOSEBRACKET,')',1,1372) -LexToken(OPERATOR,'+',1,1373) +LexToken(ADDITION,'+',1,1373) LexToken(VAR,'sz',1,1374) LexToken(OPENBRACKET,'(',1,1376) LexToken(NUMBER,'2',1,1377) LexToken(CLOSEBRACKET,')',1,1378) -LexToken(OPERATOR,'*',1,1379) +LexToken(MULTIPLICATION,'*',1,1379) LexToken(OPENSQBRACKET,'[',1,1380) LexToken(NUMBER,'0',1,1381) LexToken(SEMICOLON,';',1,1382) LexToken(NUMBER,'1',1,1385) -LexToken(OPERATOR,'/',1,1386) +LexToken(MULTIPLICATION,'/',1,1386) LexToken(NUMBER,'3',1,1387) LexToken(SEMICOLON,';',1,1388) LexToken(NUMBER,'1',1,1389) @@ -195,7 +196,7 @@ LexToken(SEMICOLON,';',1,1390) LexToken(NUMBER,'1',1,1391) LexToken(SEMICOLON,';',1,1392) LexToken(NUMBER,'1',1,1393) -LexToken(OPERATOR,'/',1,1394) +LexToken(MULTIPLICATION,'/',1,1394) LexToken(NUMBER,'3',1,1395) LexToken(CLOSESQBRACKET,']',1,1396) LexToken(SEMICOLON,';',1,1397) @@ -214,12 +215,12 @@ LexToken(VAR,'orig',1,1430) LexToken(OPENBRACKET,'(',1,1434) LexToken(NUMBER,'2',1,1435) LexToken(CLOSEBRACKET,')',1,1436) -LexToken(OPERATOR,'+',1,1437) +LexToken(ADDITION,'+',1,1437) LexToken(VAR,'sz',1,1438) LexToken(OPENBRACKET,'(',1,1440) LexToken(NUMBER,'2',1,1441) LexToken(CLOSEBRACKET,')',1,1442) -LexToken(OPERATOR,'/',1,1443) +LexToken(MULTIPLICATION,'/',1,1443) LexToken(NUMBER,'3',1,1444) LexToken(SEMICOLON,';',1,1445) LexToken(EOL,'\n',1,1446) @@ -296,7 +297,7 @@ LexToken(VAR,'sz',1,1683) LexToken(OPENBRACKET,'(',1,1685) LexToken(NUMBER,'2',1,1686) LexToken(CLOSEBRACKET,')',1,1687) -LexToken(OPERATOR,'/',1,1688) +LexToken(MULTIPLICATION,'/',1,1688) LexToken(NUMBER,'1.5',1,1689) LexToken(CLOSEBRACKET,')',1,1692) LexToken(SEMICOLON,';',1,1693) @@ -329,7 +330,7 @@ LexToken(VAR,'sz',1,1775) LexToken(OPENBRACKET,'(',1,1777) LexToken(NUMBER,'2',1,1778) LexToken(CLOSEBRACKET,')',1,1779) -LexToken(OPERATOR,'/',1,1780) +LexToken(MULTIPLICATION,'/',1,1780) LexToken(NUMBER,'1.5',1,1781) LexToken(CLOSEBRACKET,')',1,1784) LexToken(SEMICOLON,';',1,1785) @@ -356,7 +357,7 @@ LexToken(VAR,'sz',1,1845) LexToken(OPENBRACKET,'(',1,1847) LexToken(NUMBER,'2',1,1848) LexToken(CLOSEBRACKET,')',1,1849) -LexToken(OPERATOR,'/',1,1850) +LexToken(MULTIPLICATION,'/',1,1850) LexToken(NUMBER,'1.5',1,1851) LexToken(CLOSEBRACKET,')',1,1854) LexToken(SEMICOLON,';',1,1855) @@ -378,28 +379,30 @@ LexToken(EOL,'\n',1,1902) LexToken(VAR,'in',1,1911) LexToken(ASSIGNMENT,'=',1,1913) LexToken(OPENSQBRACKET,'[',1,1915) -LexToken(NUMBER,'-1',1,1916) -LexToken(OPERATOR,'/',1,1918) +LexToken(ADDITION,'-',1,1916) +LexToken(NUMBER,'1',1,1917) +LexToken(MULTIPLICATION,'/',1,1918) LexToken(NUMBER,'14',1,1919) LexToken(NUMBER,'1',1,1923) -LexToken(OPERATOR,'/',1,1924) +LexToken(MULTIPLICATION,'/',1,1924) LexToken(NUMBER,'7',1,1925) LexToken(NUMBER,'0',1,1935) LexToken(NUMBER,'0',1,1942) LexToken(NUMBER,'1',1,1952) -LexToken(OPERATOR,'/',1,1953) +LexToken(MULTIPLICATION,'/',1,1953) LexToken(NUMBER,'14',1,1954) LexToken(NUMBER,'1',1,1959) -LexToken(OPERATOR,'/',1,1960) +LexToken(MULTIPLICATION,'/',1,1960) LexToken(NUMBER,'7',1,1961) -LexToken(NUMBER,'-1',1,1971) -LexToken(OPERATOR,'/',1,1973) +LexToken(ADDITION,'-',1,1971) +LexToken(NUMBER,'1',1,1972) +LexToken(MULTIPLICATION,'/',1,1973) LexToken(NUMBER,'14',1,1974) LexToken(NUMBER,'1',1,1978) -LexToken(OPERATOR,'/',1,1979) +LexToken(MULTIPLICATION,'/',1,1979) LexToken(NUMBER,'7',1,1980) LexToken(CLOSESQBRACKET,']',1,1981) -LexToken(OPERATOR,'*',1,1982) +LexToken(MULTIPLICATION,'*',1,1982) LexToken(VAR,'diag',1,1983) LexToken(OPENBRACKET,'(',1,1987) LexToken(OPENSQBRACKET,'[',1,1988) @@ -418,25 +421,25 @@ LexToken(COLON,':',1,2016) LexToken(COMMA,',',1,2017) LexToken(NUMBER,'1',1,2018) LexToken(CLOSEBRACKET,')',1,2019) -LexToken(OPERATOR,'+',1,2020) +LexToken(ADDITION,'+',1,2020) LexToken(VAR,'ones',1,2021) LexToken(OPENBRACKET,'(',1,2025) LexToken(NUMBER,'4',1,2026) LexToken(COMMA,',',1,2027) LexToken(NUMBER,'1',1,2028) LexToken(CLOSEBRACKET,')',1,2029) -LexToken(OPERATOR,'*',1,2030) +LexToken(MULTIPLICATION,'*',1,2030) LexToken(OPENBRACKET,'(',1,2031) LexToken(VAR,'orig',1,2032) LexToken(OPENBRACKET,'(',1,2036) LexToken(NUMBER,'1',1,2037) LexToken(CLOSEBRACKET,')',1,2038) -LexToken(OPERATOR,'+',1,2039) +LexToken(ADDITION,'+',1,2039) LexToken(VAR,'sz',1,2040) LexToken(OPENBRACKET,'(',1,2042) LexToken(NUMBER,'1',1,2043) LexToken(CLOSEBRACKET,')',1,2044) -LexToken(OPERATOR,'/',1,2045) +LexToken(MULTIPLICATION,'/',1,2045) LexToken(NUMBER,'2',1,2046) LexToken(CLOSEBRACKET,')',1,2047) LexToken(COMMA,',',1,2048) @@ -446,20 +449,20 @@ LexToken(COLON,':',1,2063) LexToken(COMMA,',',1,2064) LexToken(NUMBER,'2',1,2065) LexToken(CLOSEBRACKET,')',1,2066) -LexToken(OPERATOR,'+',1,2067) +LexToken(ADDITION,'+',1,2067) LexToken(VAR,'ones',1,2068) LexToken(OPENBRACKET,'(',1,2072) LexToken(NUMBER,'4',1,2073) LexToken(COMMA,',',1,2074) LexToken(NUMBER,'1',1,2075) LexToken(CLOSEBRACKET,')',1,2076) -LexToken(OPERATOR,'*',1,2077) +LexToken(MULTIPLICATION,'*',1,2077) LexToken(OPENBRACKET,'(',1,2078) LexToken(VAR,'orig',1,2079) LexToken(OPENBRACKET,'(',1,2083) LexToken(NUMBER,'2',1,2084) LexToken(CLOSEBRACKET,')',1,2085) -LexToken(OPERATOR,'+',1,2086) +LexToken(ADDITION,'+',1,2086) LexToken(VAR,'sz',1,2087) LexToken(OPENBRACKET,'(',1,2089) LexToken(NUMBER,'2',1,2090) @@ -580,26 +583,27 @@ LexToken(VAR,'orig',1,2469) LexToken(OPENBRACKET,'(',1,2473) LexToken(NUMBER,'1',1,2474) LexToken(CLOSEBRACKET,')',1,2475) -LexToken(OPERATOR,'+',1,2476) +LexToken(ADDITION,'+',1,2476) LexToken(VAR,'sz',1,2477) LexToken(OPENBRACKET,'(',1,2479) LexToken(NUMBER,'1',1,2480) LexToken(CLOSEBRACKET,')',1,2481) -LexToken(OPERATOR,'/',1,2482) +LexToken(MULTIPLICATION,'/',1,2482) LexToken(NUMBER,'2',1,2483) -LexToken(OPERATOR,'-',1,2484) +LexToken(ADDITION,'-',1,2484) LexToken(VAR,'w',1,2485) -LexToken(OPERATOR,'/',1,2486) +LexToken(MULTIPLICATION,'/',1,2486) LexToken(NUMBER,'2',1,2487) LexToken(COMMA,',',1,2488) LexToken(VAR,'orig',1,2490) LexToken(OPENBRACKET,'(',1,2494) LexToken(NUMBER,'2',1,2495) LexToken(CLOSEBRACKET,')',1,2496) -LexToken(NUMBER,'-3',1,2497) -LexToken(OPERATOR,'*',1,2499) +LexToken(ADDITION,'-',1,2497) +LexToken(NUMBER,'3',1,2498) +LexToken(MULTIPLICATION,'*',1,2499) LexToken(VAR,'h',1,2500) -LexToken(OPERATOR,'/',1,2501) +LexToken(MULTIPLICATION,'/',1,2501) LexToken(NUMBER,'2',1,2502) LexToken(COMMA,',',1,2504) LexToken(VAR,'ident',1,2506) @@ -667,12 +671,12 @@ LexToken(VAR,'orig',1,2694) LexToken(OPENBRACKET,'(',1,2698) LexToken(NUMBER,'1',1,2699) LexToken(CLOSEBRACKET,')',1,2700) -LexToken(OPERATOR,'+',1,2701) +LexToken(ADDITION,'+',1,2701) LexToken(VAR,'sz',1,2702) LexToken(OPENBRACKET,'(',1,2704) LexToken(NUMBER,'1',1,2705) LexToken(CLOSEBRACKET,')',1,2706) -LexToken(OPERATOR,'/',1,2707) +LexToken(MULTIPLICATION,'/',1,2707) LexToken(NUMBER,'2',1,2708) LexToken(EOL,'\n',1,2709) LexToken(VAR,'y',1,2718) @@ -681,7 +685,7 @@ LexToken(VAR,'orig',1,2720) LexToken(OPENBRACKET,'(',1,2724) LexToken(NUMBER,'2',1,2725) LexToken(CLOSEBRACKET,')',1,2726) -LexToken(OPERATOR,'+',1,2727) +LexToken(ADDITION,'+',1,2727) LexToken(VAR,'sz',1,2728) LexToken(OPENBRACKET,'(',1,2730) LexToken(NUMBER,'2',1,2731) @@ -689,7 +693,7 @@ LexToken(CLOSEBRACKET,')',1,2732) LexToken(EOL,'\n',1,2733) LexToken(VAR,'typ',1,2742) LexToken(ASSIGNMENT,'=',1,2745) -LexToken(OPERATOR,'-',1,2746) +LexToken(ADDITION,'-',1,2746) LexToken(VAR,'ones',1,2747) LexToken(OPENBRACKET,'(',1,2751) LexToken(VAR,'x',1,2752) diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 422e2bd0..306efbe2 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -127,15 +127,18 @@ LexToken(VAR,'list',1,1353) LexToken(OPENBRACKET,'(',1,1357) LexToken(DQSTRING,'"vec"',1,1362) LexToken(COMMA,',',1,1363) -LexToken(NUMBER,'-1',1,1364) +LexToken(ADDITION,'-',1,1364) +LexToken(NUMBER,'1',1,1365) LexToken(COMMA,',',1,1366) LexToken(DQSTRING,'"vec"',1,1371) LexToken(COMMA,',',1,1372) -LexToken(NUMBER,'-1',1,1373) +LexToken(ADDITION,'-',1,1373) +LexToken(NUMBER,'1',1,1374) LexToken(COMMA,',',1,1375) LexToken(DQSTRING,'"vec"',1,1380) LexToken(COMMA,',',1,1381) -LexToken(NUMBER,'-1',1,1382) +LexToken(ADDITION,'-',1,1382) +LexToken(NUMBER,'1',1,1383) LexToken(COMMA,',',1,1384) LexToken(DQSTRING,'"vec"',1,1389) LexToken(COMMA,',',1,1390) @@ -367,12 +370,14 @@ LexToken(SEMICOLON,';',1,2498) LexToken(EOL,'\n',1,2499) LexToken(VAR,'x',1,2508) LexToken(ASSIGNMENT,'=',1,2509) -LexToken(NUMBER,'-1',1,2510) +LexToken(ADDITION,'-',1,2510) +LexToken(NUMBER,'1',1,2511) LexToken(SEMICOLON,';',1,2512) LexToken(EOL,'\n',1,2513) LexToken(VAR,'y',1,2522) LexToken(ASSIGNMENT,'=',1,2523) -LexToken(NUMBER,'-1',1,2524) +LexToken(ADDITION,'-',1,2524) +LexToken(NUMBER,'1',1,2525) LexToken(SEMICOLON,';',1,2526) LexToken(EOL,'\n',1,2527) LexToken(VAR,'size_x',1,2536) @@ -407,13 +412,15 @@ LexToken(VAR,'model',1,2641) LexToken(DOT,'.',1,2646) LexToken(VAR,'in',1,2647) LexToken(ASSIGNMENT,'=',1,2649) -LexToken(NUMBER,'-1',1,2650) +LexToken(ADDITION,'-',1,2650) +LexToken(NUMBER,'1',1,2651) LexToken(EOL,'\n',1,2652) LexToken(VAR,'model',1,2661) LexToken(DOT,'.',1,2666) LexToken(VAR,'in2',1,2667) LexToken(ASSIGNMENT,'=',1,2670) -LexToken(NUMBER,'-2',1,2671) +LexToken(ADDITION,'-',1,2671) +LexToken(NUMBER,'2',1,2672) LexToken(EOL,'\n',1,2673) LexToken(VAR,'model',1,2682) LexToken(DOT,'.',1,2687) diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index dad15988..ac4d27cc 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -119,7 +119,8 @@ LexToken(VAR,'list',1,1275) LexToken(OPENBRACKET,'(',1,1279) LexToken(DQSTRING,'"vec"',1,1284) LexToken(COMMA,',',1,1285) -LexToken(NUMBER,'-1',1,1286) +LexToken(ADDITION,'-',1,1286) +LexToken(NUMBER,'1',1,1287) LexToken(COMMA,',',1,1288) LexToken(DQSTRING,'"vec"',1,1293) LexToken(COMMA,',',1,1294) @@ -217,12 +218,12 @@ LexToken(VAR,'cmax',1,1780) LexToken(NUMBER,'1',1,1785) LexToken(CLOSESQBRACKET,']',1,1786) LexToken(CLOSEBRACKET,')',1,1787) -LexToken(OPERATOR,'*',1,1788) +LexToken(MULTIPLICATION,'*',1,1788) LexToken(OPENSQBRACKET,'[',1,1789) LexToken(NUMBER,'1',1,1790) LexToken(SEMICOLON,';',1,1791) LexToken(VAR,'size_c',1,1792) -LexToken(OPERATOR,'/',1,1798) +LexToken(MULTIPLICATION,'/',1,1798) LexToken(NUMBER,'3',1,1799) LexToken(CLOSESQBRACKET,']',1,1800) LexToken(SEMICOLON,';',1,1801) @@ -365,13 +366,15 @@ LexToken(VAR,'model',1,2422) LexToken(DOT,'.',1,2427) LexToken(VAR,'in',1,2428) LexToken(ASSIGNMENT,'=',1,2430) -LexToken(NUMBER,'-1',1,2431) +LexToken(ADDITION,'-',1,2431) +LexToken(NUMBER,'1',1,2432) LexToken(EOL,'\n',1,2433) LexToken(VAR,'model',1,2442) LexToken(DOT,'.',1,2447) LexToken(VAR,'in2',1,2448) LexToken(ASSIGNMENT,'=',1,2451) -LexToken(NUMBER,'-2',1,2452) +LexToken(ADDITION,'-',1,2452) +LexToken(NUMBER,'2',1,2453) LexToken(EOL,'\n',1,2454) LexToken(VAR,'model',1,2463) LexToken(DOT,'.',1,2468) diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index d7e742ca..85cb960e 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -154,11 +154,13 @@ LexToken(VAR,'list',1,1657) LexToken(OPENBRACKET,'(',1,1661) LexToken(DQSTRING,'"vec"',1,1666) LexToken(COMMA,',',1,1667) -LexToken(NUMBER,'-1',1,1668) +LexToken(ADDITION,'-',1,1668) +LexToken(NUMBER,'1',1,1669) LexToken(COMMA,',',1,1670) LexToken(DQSTRING,'"vec"',1,1675) LexToken(COMMA,',',1,1676) -LexToken(NUMBER,'-1',1,1677) +LexToken(ADDITION,'-',1,1677) +LexToken(NUMBER,'1',1,1678) LexToken(COMMA,',',1,1679) LexToken(DQSTRING,'"vec"',1,1684) LexToken(COMMA,',',1,1685) @@ -166,11 +168,13 @@ LexToken(NUMBER,'1',1,1686) LexToken(COMMA,',',1,1687) LexToken(DQSTRING,'"vec"',1,1692) LexToken(COMMA,',',1,1693) -LexToken(NUMBER,'-1',1,1694) +LexToken(ADDITION,'-',1,1694) +LexToken(NUMBER,'1',1,1695) LexToken(COMMA,',',1,1696) LexToken(DQSTRING,'"vec"',1,1701) LexToken(COMMA,',',1,1702) -LexToken(NUMBER,'-1',1,1703) +LexToken(ADDITION,'-',1,1703) +LexToken(NUMBER,'1',1,1704) LexToken(COMMA,',',1,1705) LexToken(DQSTRING,'"vec"',1,1725) LexToken(COMMA,',',1,1726) @@ -287,7 +291,7 @@ LexToken(OPENSQBRACKET,'[',1,2290) LexToken(VAR,'mess',1,2291) LexToken(SEMICOLON,';',1,2295) LexToken(DQSTRING,'"Not enough colors defined (at least "',1,2333) -LexToken(OPERATOR,'+',1,2334) +LexToken(ADDITION,'+',1,2334) LexToken(VAR,'string',1,2335) LexToken(OPENBRACKET,'(',1,2341) LexToken(VAR,'sum',1,2342) @@ -295,7 +299,7 @@ LexToken(OPENBRACKET,'(',1,2345) LexToken(VAR,'in',1,2346) LexToken(CLOSEBRACKET,')',1,2348) LexToken(CLOSEBRACKET,')',1,2349) -LexToken(OPERATOR,'+',1,2350) +LexToken(ADDITION,'+',1,2350) LexToken(DQSTRING,'")"',1,2353) LexToken(SEMICOLON,';',1,2354) LexToken(DQSTRING,'" "',1,2357) @@ -382,7 +386,8 @@ LexToken(EOL,'\n',1,2732) LexToken(IF,'if',1,2745) LexToken(VAR,'win',1,2748) LexToken(COMPARISON,'<',1,2751) -LexToken(NUMBER,'-1',1,2752) +LexToken(ADDITION,'-',1,2752) +LexToken(NUMBER,'1',1,2753) LexToken(THEN,'then',1,2755) LexToken(EOL,'\n',1,2759) LexToken(VAR,'mess',1,2776) @@ -638,7 +643,7 @@ LexToken(COMMA,',',1,4003) LexToken(VAR,'ones',1,4004) LexToken(OPENBRACKET,'(',1,4008) LexToken(NUMBER,'1',1,4009) -LexToken(OPERATOR,'-',1,4010) +LexToken(ADDITION,'-',1,4010) LexToken(VAR,'heritance',1,4011) LexToken(COMMA,',',1,4020) LexToken(NUMBER,'1',1,4021) @@ -665,9 +670,11 @@ LexToken(EOL,'\n',1,4100) LexToken(VAR,'wpos',1,4121) LexToken(ASSIGNMENT,'=',1,4125) LexToken(OPENSQBRACKET,'[',1,4126) -LexToken(NUMBER,'-1',1,4127) +LexToken(ADDITION,'-',1,4127) +LexToken(NUMBER,'1',1,4128) LexToken(SEMICOLON,';',1,4129) -LexToken(NUMBER,'-1',1,4130) +LexToken(ADDITION,'-',1,4130) +LexToken(NUMBER,'1',1,4131) LexToken(CLOSESQBRACKET,']',1,4132) LexToken(SEMICOLON,';',1,4133) LexToken(EOL,'\n',1,4134) @@ -683,9 +690,11 @@ LexToken(EOL,'\n',1,4187) LexToken(VAR,'wdim',1,4208) LexToken(ASSIGNMENT,'=',1,4212) LexToken(OPENSQBRACKET,'[',1,4213) -LexToken(NUMBER,'-1',1,4214) +LexToken(ADDITION,'-',1,4214) +LexToken(NUMBER,'1',1,4215) LexToken(SEMICOLON,';',1,4216) -LexToken(NUMBER,'-1',1,4217) +LexToken(ADDITION,'-',1,4217) +LexToken(NUMBER,'1',1,4218) LexToken(CLOSESQBRACKET,']',1,4219) LexToken(SEMICOLON,';',1,4220) LexToken(EOL,'\n',1,4221) @@ -795,7 +804,7 @@ LexToken(ASSIGNMENT,'=',1,4697) LexToken(VAR,'ones',1,4698) LexToken(OPENBRACKET,'(',1,4702) LexToken(NUMBER,'1',1,4703) -LexToken(OPERATOR,'-',1,4704) +LexToken(ADDITION,'-',1,4704) LexToken(VAR,'heritance',1,4705) LexToken(COMMA,',',1,4714) LexToken(NUMBER,'1',1,4715) @@ -871,7 +880,8 @@ LexToken(THEN,'then',1,5182) LexToken(EOL,'\n',1,5186) LexToken(VAR,'win',1,5195) LexToken(ASSIGNMENT,'=',1,5198) -LexToken(NUMBER,'-1',1,5199) +LexToken(ADDITION,'-',1,5199) +LexToken(NUMBER,'1',1,5200) LexToken(SEMICOLON,';',1,5201) LexToken(EOL,'\n',1,5202) LexToken(VAR,'in',1,5211) @@ -885,17 +895,21 @@ LexToken(EOL,'\n',1,5219) LexToken(VAR,'wdim',1,5228) LexToken(ASSIGNMENT,'=',1,5232) LexToken(OPENSQBRACKET,'[',1,5233) -LexToken(NUMBER,'-1',1,5234) +LexToken(ADDITION,'-',1,5234) +LexToken(NUMBER,'1',1,5235) LexToken(SEMICOLON,';',1,5236) -LexToken(NUMBER,'-1',1,5237) +LexToken(ADDITION,'-',1,5237) +LexToken(NUMBER,'1',1,5238) LexToken(CLOSESQBRACKET,']',1,5239) LexToken(EOL,'\n',1,5240) LexToken(VAR,'wpos',1,5249) LexToken(ASSIGNMENT,'=',1,5253) LexToken(OPENSQBRACKET,'[',1,5254) -LexToken(NUMBER,'-1',1,5255) +LexToken(ADDITION,'-',1,5255) +LexToken(NUMBER,'1',1,5256) LexToken(SEMICOLON,';',1,5257) -LexToken(NUMBER,'-1',1,5258) +LexToken(ADDITION,'-',1,5258) +LexToken(NUMBER,'1',1,5259) LexToken(CLOSESQBRACKET,']',1,5260) LexToken(EOL,'\n',1,5261) LexToken(VAR,'clrs',1,5270) @@ -928,9 +942,11 @@ LexToken(EOL,'\n',1,5311) LexToken(VAR,'ymin',1,5320) LexToken(ASSIGNMENT,'=',1,5324) LexToken(OPENSQBRACKET,'[',1,5325) -LexToken(NUMBER,'-1',1,5326) +LexToken(ADDITION,'-',1,5326) +LexToken(NUMBER,'1',1,5327) LexToken(SEMICOLON,';',1,5328) -LexToken(NUMBER,'-5',1,5329) +LexToken(ADDITION,'-',1,5329) +LexToken(NUMBER,'5',1,5330) LexToken(CLOSESQBRACKET,']',1,5331) LexToken(SEMICOLON,';',1,5332) LexToken(EOL,'\n',1,5333) diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index b74db6ca..ccf93a4e 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -155,11 +155,13 @@ LexToken(NUMBER,'1',1,1617) LexToken(COMMA,',',1,1618) LexToken(DQSTRING,'"vec"',1,1623) LexToken(COMMA,',',1,1624) -LexToken(NUMBER,'-1',1,1625) +LexToken(ADDITION,'-',1,1625) +LexToken(NUMBER,'1',1,1626) LexToken(COMMA,',',1,1627) LexToken(DQSTRING,'"vec"',1,1632) LexToken(COMMA,',',1,1633) -LexToken(NUMBER,'-1',1,1634) +LexToken(ADDITION,'-',1,1634) +LexToken(NUMBER,'1',1,1635) LexToken(COMMA,',',1,1636) LexToken(DQSTRING,'"vec"',1,1641) LexToken(COMMA,',',1,1642) @@ -279,7 +281,8 @@ LexToken(EOL,'\n',1,2167) LexToken(IF,'if',1,2180) LexToken(VAR,'win',1,2183) LexToken(COMPARISON,'<',1,2186) -LexToken(NUMBER,'-1',1,2187) +LexToken(ADDITION,'-',1,2187) +LexToken(NUMBER,'1',1,2188) LexToken(THEN,'then',1,2190) LexToken(EOL,'\n',1,2194) LexToken(VAR,'mess',1,2211) @@ -432,7 +435,8 @@ LexToken(COMMA,',',1,3055) LexToken(VAR,'list',1,3056) LexToken(OPENBRACKET,'(',1,3060) LexToken(OPENSQBRACKET,'[',1,3061) -LexToken(NUMBER,'-1',1,3062) +LexToken(ADDITION,'-',1,3062) +LexToken(NUMBER,'1',1,3063) LexToken(NUMBER,'1',1,3065) LexToken(CLOSESQBRACKET,']',1,3066) LexToken(COMMA,',',1,3067) @@ -446,7 +450,7 @@ LexToken(COMMA,',',1,3077) LexToken(VAR,'ones',1,3078) LexToken(OPENBRACKET,'(',1,3082) LexToken(NUMBER,'1',1,3083) -LexToken(OPERATOR,'-',1,3084) +LexToken(ADDITION,'-',1,3084) LexToken(VAR,'heritance',1,3085) LexToken(COMMA,',',1,3094) LexToken(NUMBER,'1',1,3095) @@ -473,9 +477,11 @@ LexToken(EOL,'\n',1,3174) LexToken(VAR,'wpos',1,3195) LexToken(ASSIGNMENT,'=',1,3199) LexToken(OPENSQBRACKET,'[',1,3200) -LexToken(NUMBER,'-1',1,3201) +LexToken(ADDITION,'-',1,3201) +LexToken(NUMBER,'1',1,3202) LexToken(SEMICOLON,';',1,3203) -LexToken(NUMBER,'-1',1,3204) +LexToken(ADDITION,'-',1,3204) +LexToken(NUMBER,'1',1,3205) LexToken(CLOSESQBRACKET,']',1,3206) LexToken(SEMICOLON,';',1,3207) LexToken(EOL,'\n',1,3208) @@ -491,9 +497,11 @@ LexToken(EOL,'\n',1,3261) LexToken(VAR,'wdim',1,3282) LexToken(ASSIGNMENT,'=',1,3286) LexToken(OPENSQBRACKET,'[',1,3287) -LexToken(NUMBER,'-1',1,3288) +LexToken(ADDITION,'-',1,3288) +LexToken(NUMBER,'1',1,3289) LexToken(SEMICOLON,';',1,3290) -LexToken(NUMBER,'-1',1,3291) +LexToken(ADDITION,'-',1,3291) +LexToken(NUMBER,'1',1,3292) LexToken(CLOSESQBRACKET,']',1,3293) LexToken(SEMICOLON,';',1,3294) LexToken(EOL,'\n',1,3295) @@ -558,7 +566,7 @@ LexToken(ASSIGNMENT,'=',1,3622) LexToken(VAR,'ones',1,3623) LexToken(OPENBRACKET,'(',1,3627) LexToken(NUMBER,'1',1,3628) -LexToken(OPERATOR,'-',1,3629) +LexToken(ADDITION,'-',1,3629) LexToken(VAR,'heritance',1,3630) LexToken(COMMA,',',1,3639) LexToken(NUMBER,'1',1,3640) @@ -609,7 +617,8 @@ LexToken(THEN,'then',1,3881) LexToken(EOL,'\n',1,3885) LexToken(VAR,'win',1,3894) LexToken(ASSIGNMENT,'=',1,3897) -LexToken(NUMBER,'-1',1,3898) +LexToken(ADDITION,'-',1,3898) +LexToken(NUMBER,'1',1,3899) LexToken(SEMICOLON,';',1,3900) LexToken(EOL,'\n',1,3901) LexToken(VAR,'wdim',1,3910) @@ -623,9 +632,11 @@ LexToken(EOL,'\n',1,3924) LexToken(VAR,'wpos',1,3933) LexToken(ASSIGNMENT,'=',1,3937) LexToken(OPENSQBRACKET,'[',1,3938) -LexToken(NUMBER,'-1',1,3939) +LexToken(ADDITION,'-',1,3939) +LexToken(NUMBER,'1',1,3940) LexToken(SEMICOLON,';',1,3941) -LexToken(NUMBER,'-1',1,3942) +LexToken(ADDITION,'-',1,3942) +LexToken(NUMBER,'1',1,3943) LexToken(CLOSESQBRACKET,']',1,3944) LexToken(EOL,'\n',1,3945) LexToken(VAR,'clrs',1,3954) @@ -656,12 +667,13 @@ LexToken(SEMICOLON,';',1,3993) LexToken(EOL,'\n',1,3994) LexToken(VAR,'ymin',1,4003) LexToken(ASSIGNMENT,'=',1,4007) -LexToken(NUMBER,'-15',1,4008) +LexToken(ADDITION,'-',1,4008) +LexToken(NUMBER,'15',1,4009) LexToken(SEMICOLON,';',1,4011) LexToken(EOL,'\n',1,4012) LexToken(VAR,'ymax',1,4021) LexToken(ASSIGNMENT,'=',1,4025) -LexToken(OPERATOR,'+',1,4026) +LexToken(ADDITION,'+',1,4026) LexToken(NUMBER,'15',1,4027) LexToken(SEMICOLON,';',1,4029) LexToken(EOL,'\n',1,4030) @@ -692,7 +704,8 @@ LexToken(VAR,'model',1,4120) LexToken(DOT,'.',1,4125) LexToken(VAR,'in',1,4126) LexToken(ASSIGNMENT,'=',1,4128) -LexToken(NUMBER,'-1',1,4129) +LexToken(ADDITION,'-',1,4129) +LexToken(NUMBER,'1',1,4130) LexToken(EOL,'\n',1,4131) LexToken(VAR,'model',1,4140) LexToken(DOT,'.',1,4145) diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index b03939f1..2a83addf 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -168,11 +168,13 @@ LexToken(NUMBER,'1',1,1622) LexToken(COMMA,',',1,1623) LexToken(DQSTRING,'"vec"',1,1628) LexToken(COMMA,',',1,1629) -LexToken(NUMBER,'-1',1,1630) +LexToken(ADDITION,'-',1,1630) +LexToken(NUMBER,'1',1,1631) LexToken(COMMA,',',1,1632) LexToken(DQSTRING,'"vec"',1,1637) LexToken(COMMA,',',1,1638) -LexToken(NUMBER,'-1',1,1639) +LexToken(ADDITION,'-',1,1639) +LexToken(NUMBER,'1',1,1640) LexToken(COMMA,',',1,1641) LexToken(DQSTRING,'"vec"',1,1646) LexToken(COMMA,',',1,1647) @@ -312,7 +314,8 @@ LexToken(EOL,'\n',1,2301) LexToken(IF,'if',1,2314) LexToken(VAR,'win',1,2317) LexToken(COMPARISON,'<',1,2320) -LexToken(NUMBER,'-1',1,2321) +LexToken(ADDITION,'-',1,2321) +LexToken(NUMBER,'1',1,2322) LexToken(THEN,'then',1,2324) LexToken(EOL,'\n',1,2328) LexToken(VAR,'mess',1,2345) @@ -438,7 +441,7 @@ LexToken(EOL,'\n',1,3044) LexToken(VAR,'in',1,3061) LexToken(ASSIGNMENT,'=',1,3064) LexToken(VAR,'nbr_curves',1,3066) -LexToken(OPERATOR,'*',1,3076) +LexToken(MULTIPLICATION,'*',1,3076) LexToken(VAR,'ones',1,3077) LexToken(OPENBRACKET,'(',1,3081) LexToken(NUMBER,'2',1,3082) @@ -512,9 +515,11 @@ LexToken(EOL,'\n',1,3258) LexToken(VAR,'wpos',1,3279) LexToken(ASSIGNMENT,'=',1,3283) LexToken(OPENSQBRACKET,'[',1,3284) -LexToken(NUMBER,'-1',1,3285) +LexToken(ADDITION,'-',1,3285) +LexToken(NUMBER,'1',1,3286) LexToken(SEMICOLON,';',1,3287) -LexToken(NUMBER,'-1',1,3288) +LexToken(ADDITION,'-',1,3288) +LexToken(NUMBER,'1',1,3289) LexToken(CLOSESQBRACKET,']',1,3290) LexToken(SEMICOLON,';',1,3291) LexToken(EOL,'\n',1,3292) @@ -530,9 +535,11 @@ LexToken(EOL,'\n',1,3345) LexToken(VAR,'wdim',1,3366) LexToken(ASSIGNMENT,'=',1,3370) LexToken(OPENSQBRACKET,'[',1,3371) -LexToken(NUMBER,'-1',1,3372) +LexToken(ADDITION,'-',1,3372) +LexToken(NUMBER,'1',1,3373) LexToken(SEMICOLON,';',1,3374) -LexToken(NUMBER,'-1',1,3375) +LexToken(ADDITION,'-',1,3375) +LexToken(NUMBER,'1',1,3376) LexToken(CLOSESQBRACKET,']',1,3377) LexToken(SEMICOLON,';',1,3378) LexToken(EOL,'\n',1,3379) @@ -625,7 +632,8 @@ LexToken(THEN,'then',1,3866) LexToken(EOL,'\n',1,3870) LexToken(VAR,'win',1,3879) LexToken(ASSIGNMENT,'=',1,3882) -LexToken(NUMBER,'-1',1,3883) +LexToken(ADDITION,'-',1,3883) +LexToken(NUMBER,'1',1,3884) LexToken(SEMICOLON,';',1,3885) LexToken(EOL,'\n',1,3886) LexToken(VAR,'clrs',1,3895) @@ -647,9 +655,11 @@ LexToken(EOL,'\n',1,3930) LexToken(VAR,'wpos',1,3939) LexToken(ASSIGNMENT,'=',1,3943) LexToken(OPENSQBRACKET,'[',1,3944) -LexToken(NUMBER,'-1',1,3945) +LexToken(ADDITION,'-',1,3945) +LexToken(NUMBER,'1',1,3946) LexToken(SEMICOLON,';',1,3947) -LexToken(NUMBER,'-1',1,3948) +LexToken(ADDITION,'-',1,3948) +LexToken(NUMBER,'1',1,3949) LexToken(CLOSESQBRACKET,']',1,3950) LexToken(EOL,'\n',1,3951) LexToken(VAR,'N',1,3960) @@ -659,7 +669,8 @@ LexToken(SEMICOLON,';',1,3963) LexToken(EOL,'\n',1,3964) LexToken(VAR,'xmin',1,3973) LexToken(ASSIGNMENT,'=',1,3977) -LexToken(NUMBER,'-15',1,3978) +LexToken(ADDITION,'-',1,3978) +LexToken(NUMBER,'15',1,3979) LexToken(SEMICOLON,';',1,3981) LexToken(EOL,'\n',1,3982) LexToken(VAR,'xmax',1,3991) @@ -669,12 +680,13 @@ LexToken(SEMICOLON,';',1,3998) LexToken(EOL,'\n',1,3999) LexToken(VAR,'ymin',1,4008) LexToken(ASSIGNMENT,'=',1,4012) -LexToken(NUMBER,'-15',1,4013) +LexToken(ADDITION,'-',1,4013) +LexToken(NUMBER,'15',1,4014) LexToken(SEMICOLON,';',1,4016) LexToken(EOL,'\n',1,4017) LexToken(VAR,'ymax',1,4026) LexToken(ASSIGNMENT,'=',1,4030) -LexToken(OPERATOR,'+',1,4031) +LexToken(ADDITION,'+',1,4031) LexToken(NUMBER,'15',1,4032) LexToken(EOL,'\n',1,4034) LexToken(VAR,'nbr_curves',1,4043) diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 629f8b77..c914e466 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -155,11 +155,13 @@ LexToken(NUMBER,'1',1,1614) LexToken(COMMA,',',1,1615) LexToken(DQSTRING,'"vec"',1,1620) LexToken(COMMA,',',1,1621) -LexToken(NUMBER,'-1',1,1622) +LexToken(ADDITION,'-',1,1622) +LexToken(NUMBER,'1',1,1623) LexToken(COMMA,',',1,1624) LexToken(DQSTRING,'"vec"',1,1629) LexToken(COMMA,',',1,1630) -LexToken(NUMBER,'-1',1,1631) +LexToken(ADDITION,'-',1,1631) +LexToken(NUMBER,'1',1,1632) LexToken(COMMA,',',1,1633) LexToken(DQSTRING,'"vec"',1,1638) LexToken(COMMA,',',1,1639) @@ -167,11 +169,13 @@ LexToken(NUMBER,'1',1,1640) LexToken(COMMA,',',1,1641) LexToken(DQSTRING,'"vec"',1,1646) LexToken(COMMA,',',1,1647) -LexToken(NUMBER,'-1',1,1648) +LexToken(ADDITION,'-',1,1648) +LexToken(NUMBER,'1',1,1649) LexToken(COMMA,',',1,1650) LexToken(DQSTRING,'"vec"',1,1655) LexToken(COMMA,',',1,1656) -LexToken(NUMBER,'-1',1,1657) +LexToken(ADDITION,'-',1,1657) +LexToken(NUMBER,'1',1,1658) LexToken(COMMA,',',1,1659) LexToken(DQSTRING,'"vec"',1,1664) LexToken(COMMA,',',1,1665) @@ -342,7 +346,8 @@ LexToken(EOL,'\n',1,2476) LexToken(IF,'if',1,2489) LexToken(VAR,'win',1,2492) LexToken(COMPARISON,'<',1,2495) -LexToken(NUMBER,'-1',1,2496) +LexToken(ADDITION,'-',1,2496) +LexToken(NUMBER,'1',1,2497) LexToken(THEN,'then',1,2499) LexToken(EOL,'\n',1,2503) LexToken(VAR,'mess',1,2520) @@ -520,7 +525,7 @@ LexToken(EOL,'\n',1,3479) LexToken(VAR,'in',1,3496) LexToken(ASSIGNMENT,'=',1,3499) LexToken(VAR,'nbr_curves',1,3501) -LexToken(OPERATOR,'*',1,3511) +LexToken(MULTIPLICATION,'*',1,3511) LexToken(VAR,'ones',1,3512) LexToken(OPENBRACKET,'(',1,3516) LexToken(NUMBER,'3',1,3517) @@ -594,9 +599,11 @@ LexToken(EOL,'\n',1,3693) LexToken(VAR,'wpos',1,3714) LexToken(ASSIGNMENT,'=',1,3718) LexToken(OPENSQBRACKET,'[',1,3719) -LexToken(NUMBER,'-1',1,3720) +LexToken(ADDITION,'-',1,3720) +LexToken(NUMBER,'1',1,3721) LexToken(SEMICOLON,';',1,3722) -LexToken(NUMBER,'-1',1,3723) +LexToken(ADDITION,'-',1,3723) +LexToken(NUMBER,'1',1,3724) LexToken(CLOSESQBRACKET,']',1,3725) LexToken(SEMICOLON,';',1,3726) LexToken(EOL,'\n',1,3727) @@ -612,9 +619,11 @@ LexToken(EOL,'\n',1,3780) LexToken(VAR,'wdim',1,3801) LexToken(ASSIGNMENT,'=',1,3805) LexToken(OPENSQBRACKET,'[',1,3806) -LexToken(NUMBER,'-1',1,3807) +LexToken(ADDITION,'-',1,3807) +LexToken(NUMBER,'1',1,3808) LexToken(SEMICOLON,';',1,3809) -LexToken(NUMBER,'-1',1,3810) +LexToken(ADDITION,'-',1,3810) +LexToken(NUMBER,'1',1,3811) LexToken(CLOSESQBRACKET,']',1,3812) LexToken(SEMICOLON,';',1,3813) LexToken(EOL,'\n',1,3814) @@ -741,7 +750,8 @@ LexToken(THEN,'then',1,4307) LexToken(EOL,'\n',1,4311) LexToken(VAR,'win',1,4320) LexToken(ASSIGNMENT,'=',1,4324) -LexToken(NUMBER,'-1',1,4326) +LexToken(ADDITION,'-',1,4326) +LexToken(NUMBER,'1',1,4327) LexToken(SEMICOLON,';',1,4328) LexToken(EOL,'\n',1,4329) LexToken(VAR,'clrs',1,4338) @@ -795,9 +805,11 @@ LexToken(EOL,'\n',1,4420) LexToken(VAR,'wpos',1,4429) LexToken(ASSIGNMENT,'=',1,4434) LexToken(OPENSQBRACKET,'[',1,4436) -LexToken(NUMBER,'-1',1,4437) +LexToken(ADDITION,'-',1,4437) +LexToken(NUMBER,'1',1,4438) LexToken(SEMICOLON,';',1,4439) -LexToken(NUMBER,'-1',1,4440) +LexToken(ADDITION,'-',1,4440) +LexToken(NUMBER,'1',1,4441) LexToken(CLOSESQBRACKET,']',1,4442) LexToken(EOL,'\n',1,4443) LexToken(VAR,'N',1,4452) @@ -816,7 +828,8 @@ LexToken(EOL,'\n',1,4482) LexToken(VAR,'vec_x',1,4491) LexToken(ASSIGNMENT,'=',1,4497) LexToken(OPENSQBRACKET,'[',1,4499) -LexToken(NUMBER,'-15',1,4500) +LexToken(ADDITION,'-',1,4500) +LexToken(NUMBER,'15',1,4501) LexToken(SEMICOLON,';',1,4503) LexToken(NUMBER,'15',1,4504) LexToken(CLOSESQBRACKET,']',1,4506) @@ -824,7 +837,8 @@ LexToken(EOL,'\n',1,4507) LexToken(VAR,'vec_y',1,4516) LexToken(ASSIGNMENT,'=',1,4522) LexToken(OPENSQBRACKET,'[',1,4524) -LexToken(NUMBER,'-15',1,4525) +LexToken(ADDITION,'-',1,4525) +LexToken(NUMBER,'15',1,4526) LexToken(SEMICOLON,';',1,4528) LexToken(NUMBER,'15',1,4529) LexToken(CLOSESQBRACKET,']',1,4531) @@ -832,7 +846,8 @@ LexToken(EOL,'\n',1,4532) LexToken(VAR,'vec_z',1,4541) LexToken(ASSIGNMENT,'=',1,4547) LexToken(OPENSQBRACKET,'[',1,4549) -LexToken(NUMBER,'-15',1,4550) +LexToken(ADDITION,'-',1,4550) +LexToken(NUMBER,'15',1,4551) LexToken(SEMICOLON,';',1,4553) LexToken(NUMBER,'15',1,4554) LexToken(CLOSESQBRACKET,']',1,4556) diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index acf12de8..0a92fb44 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -266,7 +266,8 @@ LexToken(DOT,'.',1,2123) LexToken(VAR,'in',1,2124) LexToken(ASSIGNMENT,'=',1,2126) LexToken(OPENSQBRACKET,'[',1,2127) -LexToken(NUMBER,'-1',1,2128) +LexToken(ADDITION,'-',1,2128) +LexToken(NUMBER,'1',1,2129) LexToken(CLOSESQBRACKET,']',1,2130) LexToken(EOL,'\n',1,2131) LexToken(VAR,'model',1,2140) diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 406ce194..8ddc26d2 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -239,7 +239,8 @@ LexToken(THEN,'then',1,1937) LexToken(EOL,'\n',1,1941) LexToken(VAR,'n',1,1950) LexToken(ASSIGNMENT,'=',1,1951) -LexToken(NUMBER,'-1',1,1952) +LexToken(ADDITION,'-',1,1952) +LexToken(NUMBER,'1',1,1953) LexToken(EOL,'\n',1,1954) LexToken(VAR,'prt',1,1963) LexToken(ASSIGNMENT,'=',1,1966) @@ -261,19 +262,22 @@ LexToken(VAR,'model',1,2033) LexToken(DOT,'.',1,2038) LexToken(VAR,'in',1,2039) LexToken(ASSIGNMENT,'=',1,2041) -LexToken(NUMBER,'-1',1,2042) +LexToken(ADDITION,'-',1,2042) +LexToken(NUMBER,'1',1,2043) LexToken(EOL,'\n',1,2044) LexToken(VAR,'model',1,2053) LexToken(DOT,'.',1,2058) LexToken(VAR,'in2',1,2059) LexToken(ASSIGNMENT,'=',1,2062) -LexToken(NUMBER,'-2',1,2063) +LexToken(ADDITION,'-',1,2063) +LexToken(NUMBER,'2',1,2064) LexToken(EOL,'\n',1,2065) LexToken(VAR,'model',1,2074) LexToken(DOT,'.',1,2079) LexToken(VAR,'intyp',1,2080) LexToken(ASSIGNMENT,'=',1,2085) -LexToken(NUMBER,'-1',1,2086) +LexToken(ADDITION,'-',1,2086) +LexToken(NUMBER,'1',1,2087) LexToken(EOL,'\n',1,2088) LexToken(VAR,'model',1,2097) LexToken(DOT,'.',1,2102) diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 84fd1d28..9ff066b1 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -225,19 +225,19 @@ LexToken(EOL,'\n',1,2092) LexToken(VAR,'execstr',1,2105) LexToken(OPENBRACKET,'(',1,2112) LexToken(DQSTRING,'"if type("',1,2122) -LexToken(OPERATOR,'+',1,2123) +LexToken(ADDITION,'+',1,2123) LexToken(VAR,'varnam',1,2124) -LexToken(OPERATOR,'+',1,2130) +LexToken(ADDITION,'+',1,2130) LexToken(DQSTRING,'") <> 17 | or(fieldnames("',1,2156) -LexToken(OPERATOR,'+',1,2157) +LexToken(ADDITION,'+',1,2157) LexToken(VAR,'varnam',1,2158) -LexToken(OPERATOR,'+',1,2164) +LexToken(ADDITION,'+',1,2164) LexToken(DQSTRING,'") <> [\\"values\\"; \\"time\\"]) then"',1,2199) -LexToken(OPERATOR,'+',1,2201) +LexToken(ADDITION,'+',1,2201) LexToken(DQSTRING,'" message([\\"Protected variable name.\\"; \\"Please choose another variable name.\\"]);"',1,2303) -LexToken(OPERATOR,'+',1,2305) +LexToken(ADDITION,'+',1,2305) LexToken(DQSTRING,'" ok = %f;"',1,2333) -LexToken(OPERATOR,'+',1,2335) +LexToken(ADDITION,'+',1,2335) LexToken(DQSTRING,'" end"',1,2358) LexToken(COMMA,',',1,2359) LexToken(DQSTRING,'"errcatch"',1,2370) @@ -266,12 +266,15 @@ LexToken(COMMA,',',1,2460) LexToken(VAR,'list',1,2482) LexToken(OPENBRACKET,'(',1,2486) LexToken(OPENSQBRACKET,'[',1,2487) -LexToken(NUMBER,'-1',1,2488) +LexToken(ADDITION,'-',1,2488) +LexToken(NUMBER,'1',1,2489) LexToken(COMMA,',',1,2490) -LexToken(NUMBER,'-2',1,2492) +LexToken(ADDITION,'-',1,2492) +LexToken(NUMBER,'2',1,2493) LexToken(CLOSESQBRACKET,']',1,2494) LexToken(COMMA,',',1,2495) -LexToken(NUMBER,'-1',1,2497) +LexToken(ADDITION,'-',1,2497) +LexToken(NUMBER,'1',1,2498) LexToken(CLOSEBRACKET,')',1,2499) LexToken(COMMA,',',1,2500) LexToken(VAR,'list',1,2502) @@ -281,7 +284,7 @@ LexToken(COMMA,',',1,2508) LexToken(VAR,'ones',1,2530) LexToken(OPENBRACKET,'(',1,2534) LexToken(NUMBER,'1',1,2535) -LexToken(OPERATOR,'-',1,2536) +LexToken(ADDITION,'-',1,2536) LexToken(VAR,'herit',1,2537) LexToken(COMMA,',',1,2542) LexToken(NUMBER,'1',1,2544) @@ -370,7 +373,8 @@ LexToken(THEN,'then',1,2963) LexToken(EOL,'\n',1,2967) LexToken(VAR,'nu',1,2976) LexToken(ASSIGNMENT,'=',1,2983) -LexToken(NUMBER,'-1',1,2985) +LexToken(ADDITION,'-',1,2985) +LexToken(NUMBER,'1',1,2986) LexToken(SEMICOLON,';',1,2987) LexToken(EOL,'\n',1,2988) LexToken(VAR,'nz',1,2997) @@ -421,14 +425,16 @@ LexToken(VAR,'model',1,3181) LexToken(DOT,'.',1,3186) LexToken(VAR,'in2',1,3187) LexToken(ASSIGNMENT,'=',1,3197) -LexToken(NUMBER,'-2',1,3199) +LexToken(ADDITION,'-',1,3199) +LexToken(NUMBER,'2',1,3200) LexToken(SEMICOLON,';',1,3201) LexToken(EOL,'\n',1,3202) LexToken(VAR,'model',1,3211) LexToken(DOT,'.',1,3216) LexToken(VAR,'intyp',1,3217) LexToken(ASSIGNMENT,'=',1,3227) -LexToken(NUMBER,'-1',1,3229) +LexToken(ADDITION,'-',1,3229) +LexToken(NUMBER,'1',1,3230) LexToken(SEMICOLON,';',1,3231) LexToken(EOL,'\n',1,3232) LexToken(VAR,'model',1,3241) diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 79ecb189..7b30eb35 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -73,7 +73,8 @@ LexToken(THEN,'then',1,976) LexToken(EOL,'\n',1,980) LexToken(VAR,'in',1,989) LexToken(ASSIGNMENT,'=',1,991) -LexToken(NUMBER,'-1',1,992) +LexToken(ADDITION,'-',1,992) +LexToken(NUMBER,'1',1,993) LexToken(EOL,'\n',1,994) LexToken(EOL,'\n',1,995) LexToken(VAR,'model',1,1004) diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 2d5b6614..4e9ea09a 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -650,19 +650,20 @@ LexToken(CLOSEBRACKET,')',1,4531) LexToken(COMPARISON,'<>',1,4532) LexToken(OPENBRACKET,'(',1,4534) LexToken(VAR,'nin',1,4535) -LexToken(OPERATOR,'+',1,4538) +LexToken(ADDITION,'+',1,4538) LexToken(NUMBER,'1',1,4539) LexToken(CLOSEBRACKET,')',1,4540) -LexToken(OPERATOR,'*',1,4541) +LexToken(MULTIPLICATION,'*',1,4541) LexToken(VAR,'N',1,4542) -LexToken(OPERATOR,'+',1,4543) +LexToken(ADDITION,'+',1,4543) LexToken(NUMBER,'2',1,4544) LexToken(THEN,'then',1,4546) LexToken(EOL,'\n',1,4550) LexToken(VAR,'dstate',1,4571) LexToken(ASSIGNMENT,'=',1,4577) LexToken(OPENSQBRACKET,'[',1,4578) -LexToken(NUMBER,'-1',1,4579) +LexToken(ADDITION,'-',1,4579) +LexToken(NUMBER,'1',1,4580) LexToken(SEMICOLON,';',1,4581) LexToken(VAR,'lunit',1,4582) LexToken(SEMICOLON,';',1,4587) @@ -670,10 +671,10 @@ LexToken(VAR,'zeros',1,4588) LexToken(OPENBRACKET,'(',1,4593) LexToken(OPENBRACKET,'(',1,4594) LexToken(VAR,'nin',1,4595) -LexToken(OPERATOR,'+',1,4598) +LexToken(ADDITION,'+',1,4598) LexToken(NUMBER,'1',1,4599) LexToken(CLOSEBRACKET,')',1,4600) -LexToken(OPERATOR,'*',1,4601) +LexToken(MULTIPLICATION,'*',1,4601) LexToken(VAR,'N',1,4602) LexToken(COMMA,',',1,4603) LexToken(NUMBER,'1',1,4604) @@ -798,7 +799,8 @@ LexToken(DOT,'.',1,5164) LexToken(VAR,'dstate',1,5165) LexToken(ASSIGNMENT,'=',1,5171) LexToken(OPENSQBRACKET,'[',1,5172) -LexToken(NUMBER,'-1',1,5173) +LexToken(ADDITION,'-',1,5173) +LexToken(NUMBER,'1',1,5174) LexToken(SEMICOLON,';',1,5175) LexToken(VAR,'lunit',1,5176) LexToken(SEMICOLON,';',1,5181) @@ -806,10 +808,10 @@ LexToken(VAR,'zeros',1,5182) LexToken(OPENBRACKET,'(',1,5187) LexToken(OPENBRACKET,'(',1,5188) LexToken(VAR,'nin',1,5189) -LexToken(OPERATOR,'+',1,5192) +LexToken(ADDITION,'+',1,5192) LexToken(NUMBER,'1',1,5193) LexToken(CLOSEBRACKET,')',1,5194) -LexToken(OPERATOR,'*',1,5195) +LexToken(MULTIPLICATION,'*',1,5195) LexToken(VAR,'N',1,5196) LexToken(COMMA,',',1,5197) LexToken(NUMBER,'1',1,5198) diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 7260b1e7..62922425 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -353,19 +353,20 @@ LexToken(CLOSEBRACKET,')',1,2612) LexToken(COMPARISON,'<>',1,2613) LexToken(OPENBRACKET,'(',1,2615) LexToken(VAR,'nin',1,2616) -LexToken(OPERATOR,'+',1,2619) +LexToken(ADDITION,'+',1,2619) LexToken(NUMBER,'1',1,2620) LexToken(CLOSEBRACKET,')',1,2621) -LexToken(OPERATOR,'*',1,2622) +LexToken(MULTIPLICATION,'*',1,2622) LexToken(VAR,'N',1,2623) -LexToken(OPERATOR,'+',1,2624) +LexToken(ADDITION,'+',1,2624) LexToken(NUMBER,'2',1,2625) LexToken(THEN,'then',1,2627) LexToken(EOL,'\n',1,2631) LexToken(VAR,'dstate',1,2652) LexToken(ASSIGNMENT,'=',1,2658) LexToken(OPENSQBRACKET,'[',1,2659) -LexToken(NUMBER,'-1',1,2660) +LexToken(ADDITION,'-',1,2660) +LexToken(NUMBER,'1',1,2661) LexToken(SEMICOLON,';',1,2662) LexToken(VAR,'lunit',1,2663) LexToken(SEMICOLON,';',1,2668) @@ -373,10 +374,10 @@ LexToken(VAR,'zeros',1,2669) LexToken(OPENBRACKET,'(',1,2674) LexToken(OPENBRACKET,'(',1,2675) LexToken(VAR,'nin',1,2676) -LexToken(OPERATOR,'+',1,2679) +LexToken(ADDITION,'+',1,2679) LexToken(NUMBER,'1',1,2680) LexToken(CLOSEBRACKET,')',1,2681) -LexToken(OPERATOR,'*',1,2682) +LexToken(MULTIPLICATION,'*',1,2682) LexToken(VAR,'N',1,2683) LexToken(COMMA,',',1,2684) LexToken(NUMBER,'1',1,2685) @@ -503,7 +504,8 @@ LexToken(DOT,'.',1,3229) LexToken(VAR,'dstate',1,3230) LexToken(ASSIGNMENT,'=',1,3236) LexToken(OPENSQBRACKET,'[',1,3237) -LexToken(NUMBER,'-1',1,3238) +LexToken(ADDITION,'-',1,3238) +LexToken(NUMBER,'1',1,3239) LexToken(SEMICOLON,';',1,3240) LexToken(VAR,'lunit',1,3241) LexToken(SEMICOLON,';',1,3246) @@ -511,10 +513,10 @@ LexToken(VAR,'zeros',1,3247) LexToken(OPENBRACKET,'(',1,3252) LexToken(OPENBRACKET,'(',1,3253) LexToken(VAR,'nin',1,3254) -LexToken(OPERATOR,'+',1,3257) +LexToken(ADDITION,'+',1,3257) LexToken(NUMBER,'1',1,3258) LexToken(CLOSEBRACKET,')',1,3259) -LexToken(OPERATOR,'*',1,3260) +LexToken(MULTIPLICATION,'*',1,3260) LexToken(VAR,'N',1,3261) LexToken(COMMA,',',1,3262) LexToken(NUMBER,'1',1,3263) diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index da45524c..d43b03ee 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -335,7 +335,7 @@ LexToken(COMMA,',',1,2186) LexToken(VAR,'gettext',1,2207) LexToken(OPENBRACKET,'(',1,2214) LexToken(DQSTRING,'"Valid formats are: "',1,2235) -LexToken(OPERATOR,'+',1,2237) +LexToken(ADDITION,'+',1,2237) LexToken(VAR,'strcat',1,2239) LexToken(OPENBRACKET,'(',1,2245) LexToken(VAR,'fmts',1,2246) @@ -677,19 +677,20 @@ LexToken(CLOSEBRACKET,')',1,4397) LexToken(COMPARISON,'<>',1,4398) LexToken(OPENBRACKET,'(',1,4400) LexToken(VAR,'nin',1,4401) -LexToken(OPERATOR,'+',1,4404) +LexToken(ADDITION,'+',1,4404) LexToken(NUMBER,'1',1,4405) LexToken(CLOSEBRACKET,')',1,4406) -LexToken(OPERATOR,'*',1,4407) +LexToken(MULTIPLICATION,'*',1,4407) LexToken(VAR,'N',1,4408) -LexToken(OPERATOR,'+',1,4409) +LexToken(ADDITION,'+',1,4409) LexToken(NUMBER,'2',1,4410) LexToken(THEN,'then',1,4412) LexToken(EOL,'\n',1,4416) LexToken(VAR,'dstate',1,4437) LexToken(ASSIGNMENT,'=',1,4443) LexToken(OPENSQBRACKET,'[',1,4444) -LexToken(NUMBER,'-1',1,4445) +LexToken(ADDITION,'-',1,4445) +LexToken(NUMBER,'1',1,4446) LexToken(SEMICOLON,';',1,4447) LexToken(VAR,'lunit',1,4448) LexToken(SEMICOLON,';',1,4453) @@ -697,10 +698,10 @@ LexToken(VAR,'zeros',1,4454) LexToken(OPENBRACKET,'(',1,4459) LexToken(OPENBRACKET,'(',1,4460) LexToken(VAR,'nin',1,4461) -LexToken(OPERATOR,'+',1,4464) +LexToken(ADDITION,'+',1,4464) LexToken(NUMBER,'1',1,4465) LexToken(CLOSEBRACKET,')',1,4466) -LexToken(OPERATOR,'*',1,4467) +LexToken(MULTIPLICATION,'*',1,4467) LexToken(VAR,'N',1,4468) LexToken(COMMA,',',1,4469) LexToken(NUMBER,'1',1,4470) @@ -827,7 +828,8 @@ LexToken(DOT,'.',1,5123) LexToken(VAR,'dstate',1,5124) LexToken(ASSIGNMENT,'=',1,5130) LexToken(OPENSQBRACKET,'[',1,5131) -LexToken(NUMBER,'-1',1,5132) +LexToken(ADDITION,'-',1,5132) +LexToken(NUMBER,'1',1,5133) LexToken(SEMICOLON,';',1,5134) LexToken(VAR,'lunit',1,5135) LexToken(SEMICOLON,';',1,5140) @@ -835,10 +837,10 @@ LexToken(VAR,'zeros',1,5141) LexToken(OPENBRACKET,'(',1,5146) LexToken(OPENBRACKET,'(',1,5147) LexToken(VAR,'nin',1,5148) -LexToken(OPERATOR,'+',1,5151) +LexToken(ADDITION,'+',1,5151) LexToken(NUMBER,'1',1,5152) LexToken(CLOSEBRACKET,')',1,5153) -LexToken(OPERATOR,'*',1,5154) +LexToken(MULTIPLICATION,'*',1,5154) LexToken(VAR,'N',1,5155) LexToken(COMMA,',',1,5156) LexToken(NUMBER,'1',1,5157) diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 2c3dd0f4..42da7ab2 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -203,7 +203,8 @@ LexToken(VAR,'model',1,1781) LexToken(DOT,'.',1,1786) LexToken(VAR,'firing',1,1787) LexToken(ASSIGNMENT,'=',1,1793) -LexToken(NUMBER,'-1',1,1794) +LexToken(ADDITION,'-',1,1794) +LexToken(NUMBER,'1',1,1795) LexToken(EOL,'\n',1,1811) LexToken(VAR,'graphics',1,1828) LexToken(DOT,'.',1,1836) @@ -271,7 +272,8 @@ LexToken(VAR,'model',1,2139) LexToken(DOT,'.',1,2144) LexToken(VAR,'firing',1,2145) LexToken(ASSIGNMENT,'=',1,2151) -LexToken(NUMBER,'-1',1,2152) +LexToken(ADDITION,'-',1,2152) +LexToken(NUMBER,'1',1,2153) LexToken(EOL,'\n',1,2154) LexToken(VAR,'model',1,2163) LexToken(DOT,'.',1,2168) diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index cfaf106f..3b5e7e5c 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -169,7 +169,8 @@ LexToken(VAR,'model',1,1510) LexToken(DOT,'.',1,1515) LexToken(VAR,'firing',1,1516) LexToken(ASSIGNMENT,'=',1,1522) -LexToken(NUMBER,'-1',1,1523) +LexToken(ADDITION,'-',1,1523) +LexToken(NUMBER,'1',1,1524) LexToken(EOL,'\n',1,1540) LexToken(VAR,'graphics',1,1557) LexToken(DOT,'.',1,1565) @@ -237,7 +238,8 @@ LexToken(VAR,'model',1,1868) LexToken(DOT,'.',1,1873) LexToken(VAR,'firing',1,1874) LexToken(ASSIGNMENT,'=',1,1880) -LexToken(NUMBER,'-1',1,1881) +LexToken(ADDITION,'-',1,1881) +LexToken(NUMBER,'1',1,1882) LexToken(EOL,'\n',1,1883) LexToken(VAR,'model',1,1892) LexToken(DOT,'.',1,1897) diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 818ba0e1..36093673 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -371,7 +371,7 @@ LexToken(VAR,'size',1,2497) LexToken(OPENBRACKET,'(',1,2501) LexToken(VAR,'newpar',1,2502) LexToken(CLOSEBRACKET,')',1,2508) -LexToken(OPERATOR,'+',1,2509) +LexToken(ADDITION,'+',1,2509) LexToken(NUMBER,'1',1,2510) LexToken(CLOSEBRACKET,')',1,2511) LexToken(ASSIGNMENT,'=',1,2512) @@ -672,7 +672,8 @@ LexToken(ASSIGNMENT,'=',1,3685) LexToken(OPENSQBRACKET,'[',1,3686) LexToken(NUMBER,'5',1,3687) LexToken(COMMA,',',1,3688) -LexToken(NUMBER,'-1',1,3689) +LexToken(ADDITION,'-',1,3689) +LexToken(NUMBER,'1',1,3690) LexToken(CLOSESQBRACKET,']',1,3691) LexToken(COMMA,',',1,3692) LexToken(VAR,'from',1,3693) @@ -731,7 +732,8 @@ LexToken(ASSIGNMENT,'=',1,3822) LexToken(OPENSQBRACKET,'[',1,3823) LexToken(NUMBER,'5',1,3824) LexToken(COMMA,',',1,3825) -LexToken(NUMBER,'-1',1,3826) +LexToken(ADDITION,'-',1,3826) +LexToken(NUMBER,'1',1,3827) LexToken(CLOSESQBRACKET,']',1,3828) LexToken(COMMA,',',1,3829) LexToken(VAR,'from',1,3830) @@ -789,7 +791,8 @@ LexToken(ASSIGNMENT,'=',1,3962) LexToken(OPENSQBRACKET,'[',1,3963) LexToken(NUMBER,'5',1,3964) LexToken(COMMA,',',1,3965) -LexToken(NUMBER,'-1',1,3966) +LexToken(ADDITION,'-',1,3966) +LexToken(NUMBER,'1',1,3967) LexToken(CLOSESQBRACKET,']',1,3968) LexToken(COMMA,',',1,3969) LexToken(VAR,'from',1,3970) diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index 908b48d1..2a8c34c1 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -318,7 +318,7 @@ LexToken(VAR,'size',1,2164) LexToken(OPENBRACKET,'(',1,2168) LexToken(VAR,'newpar',1,2169) LexToken(CLOSEBRACKET,')',1,2175) -LexToken(OPERATOR,'+',1,2176) +LexToken(ADDITION,'+',1,2176) LexToken(NUMBER,'1',1,2177) LexToken(CLOSEBRACKET,')',1,2178) LexToken(ASSIGNMENT,'=',1,2179) @@ -615,7 +615,8 @@ LexToken(ASSIGNMENT,'=',1,3346) LexToken(OPENSQBRACKET,'[',1,3347) LexToken(NUMBER,'5',1,3348) LexToken(COMMA,',',1,3349) -LexToken(NUMBER,'-1',1,3350) +LexToken(ADDITION,'-',1,3350) +LexToken(NUMBER,'1',1,3351) LexToken(CLOSESQBRACKET,']',1,3352) LexToken(COMMA,',',1,3353) LexToken(VAR,'from',1,3354) @@ -674,7 +675,8 @@ LexToken(ASSIGNMENT,'=',1,3483) LexToken(OPENSQBRACKET,'[',1,3484) LexToken(NUMBER,'5',1,3485) LexToken(COMMA,',',1,3486) -LexToken(NUMBER,'-1',1,3487) +LexToken(ADDITION,'-',1,3487) +LexToken(NUMBER,'1',1,3488) LexToken(CLOSESQBRACKET,']',1,3489) LexToken(COMMA,',',1,3490) LexToken(VAR,'from',1,3491) @@ -732,7 +734,8 @@ LexToken(ASSIGNMENT,'=',1,3623) LexToken(OPENSQBRACKET,'[',1,3624) LexToken(NUMBER,'5',1,3625) LexToken(COMMA,',',1,3626) -LexToken(NUMBER,'-1',1,3627) +LexToken(ADDITION,'-',1,3627) +LexToken(NUMBER,'1',1,3628) LexToken(CLOSESQBRACKET,']',1,3629) LexToken(COMMA,',',1,3630) LexToken(VAR,'from',1,3631) diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index ad25b446..e72b79dd 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -111,7 +111,8 @@ LexToken(VAR,'list',1,1152) LexToken(OPENBRACKET,'(',1,1156) LexToken(DQSTRING,'"vec"',1,1161) LexToken(COMMA,',',1,1162) -LexToken(NUMBER,'-1',1,1163) +LexToken(ADDITION,'-',1,1163) +LexToken(NUMBER,'1',1,1164) LexToken(CLOSEBRACKET,')',1,1165) LexToken(COMMA,',',1,1166) LexToken(VAR,'exprs',1,1167) diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 0160275a..996fd885 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -112,7 +112,8 @@ LexToken(VAR,'list',1,1155) LexToken(OPENBRACKET,'(',1,1159) LexToken(DQSTRING,'"vec"',1,1164) LexToken(COMMA,',',1,1165) -LexToken(NUMBER,'-1',1,1166) +LexToken(ADDITION,'-',1,1166) +LexToken(NUMBER,'1',1,1167) LexToken(CLOSEBRACKET,')',1,1168) LexToken(COMMA,',',1,1169) LexToken(VAR,'exprs',1,1170) diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index e4f3ffa9..bba55d6b 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -132,7 +132,8 @@ LexToken(VAR,'list',1,1330) LexToken(OPENBRACKET,'(',1,1334) LexToken(DQSTRING,'"vec"',1,1339) LexToken(COMMA,',',1,1340) -LexToken(NUMBER,'-1',1,1342) +LexToken(ADDITION,'-',1,1342) +LexToken(NUMBER,'1',1,1343) LexToken(CLOSEBRACKET,')',1,1344) LexToken(COMMA,',',1,1345) LexToken(VAR,'exprs',1,1347) diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 6bcb7f3e..51cefb3c 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -136,7 +136,7 @@ LexToken(DQSTRING,'"Spline data"',1,1444) LexToken(COMMA,',',1,1445) LexToken(OPENSQBRACKET,'[',1,1446) LexToken(DQSTRING,'"Spline"',1,1454) -LexToken(OPERATOR,'+',1,1455) +LexToken(ADDITION,'+',1,1455) LexToken(DQSTRING,'" Method (0..7)"',1,1487) LexToken(SEMICOLON,';',1,1488) LexToken(DQSTRING,'"x"',1,1491) @@ -146,7 +146,7 @@ LexToken(SEMICOLON,';',1,1496) LexToken(DQSTRING,'"Periodic signal(y/n)?"',1,1519) LexToken(SEMICOLON,';',1,1520) LexToken(DQSTRING,'"Launch"',1,1528) -LexToken(OPERATOR,'+',1,1529) +LexToken(ADDITION,'+',1,1529) LexToken(DQSTRING,'" graphic window(y/n)?"',1,1568) LexToken(CLOSESQBRACKET,']',1,1569) LexToken(COMMA,',',1,1570) @@ -158,11 +158,13 @@ LexToken(NUMBER,'1',1,1582) LexToken(COMMA,',',1,1583) LexToken(DQSTRING,'"vec"',1,1588) LexToken(COMMA,',',1,1589) -LexToken(NUMBER,'-1',1,1590) +LexToken(ADDITION,'-',1,1590) +LexToken(NUMBER,'1',1,1591) LexToken(COMMA,',',1,1592) LexToken(DQSTRING,'"vec"',1,1614) LexToken(COMMA,',',1,1615) -LexToken(NUMBER,'-1',1,1616) +LexToken(ADDITION,'-',1,1616) +LexToken(NUMBER,'1',1,1617) LexToken(COMMA,',',1,1618) LexToken(DQSTRING,'"str"',1,1623) LexToken(COMMA,',',1,1624) @@ -444,7 +446,7 @@ LexToken(VAR,'winsid',1,3023) LexToken(OPENBRACKET,'(',1,3029) LexToken(CLOSEBRACKET,')',1,3030) LexToken(CLOSEBRACKET,')',1,3031) -LexToken(OPERATOR,'+',1,3032) +LexToken(ADDITION,'+',1,3032) LexToken(NUMBER,'1',1,3033) LexToken(SEMICOLON,';',1,3034) LexToken(EOL,'\n',1,3064) @@ -503,11 +505,11 @@ LexToken(COMMA,',',1,3528) LexToken(VAR,'orpar',1,3529) LexToken(OPENBRACKET,'(',1,3534) LexToken(VAR,'N2',1,3535) -LexToken(OPERATOR,'+',1,3537) +LexToken(ADDITION,'+',1,3537) LexToken(NUMBER,'1',1,3538) LexToken(COLON,':',1,3539) LexToken(NUMBER,'2',1,3540) -LexToken(OPERATOR,'*',1,3541) +LexToken(MULTIPLICATION,'*',1,3541) LexToken(VAR,'N2',1,3542) LexToken(CLOSEBRACKET,')',1,3544) LexToken(CLOSESQBRACKET,']',1,3545) @@ -569,7 +571,8 @@ LexToken(OPENBRACKET,'(',1,3812) LexToken(NUMBER,'1',1,3813) LexToken(COLON,':',1,3814) LexToken(VAR,'N',1,3815) -LexToken(NUMBER,'-1',1,3816) +LexToken(ADDITION,'-',1,3816) +LexToken(NUMBER,'1',1,3817) LexToken(COMMA,',',1,3818) LexToken(NUMBER,'2',1,3819) LexToken(CLOSEBRACKET,')',1,3820) @@ -579,7 +582,8 @@ LexToken(OPENBRACKET,'(',1,3826) LexToken(NUMBER,'1',1,3827) LexToken(COLON,':',1,3828) LexToken(VAR,'N2',1,3829) -LexToken(NUMBER,'-1',1,3831) +LexToken(ADDITION,'-',1,3831) +LexToken(NUMBER,'1',1,3832) LexToken(COMMA,',',1,3833) LexToken(NUMBER,'2',1,3834) LexToken(CLOSEBRACKET,')',1,3835) @@ -941,7 +945,8 @@ LexToken(VAR,'model',1,5710) LexToken(DOT,'.',1,5715) LexToken(VAR,'firing',1,5716) LexToken(ASSIGNMENT,'=',1,5722) -LexToken(NUMBER,'-1',1,5723) +LexToken(ADDITION,'-',1,5723) +LexToken(NUMBER,'1',1,5724) LexToken(SEMICOLON,';',1,5725) LexToken(EOL,'\n',1,5726) LexToken(END,'end',1,5743) @@ -1011,7 +1016,8 @@ LexToken(NUMBER,'10',1,6053) LexToken(COMMA,',',1,6055) LexToken(NUMBER,'20',1,6057) LexToken(COMMA,',',1,6059) -LexToken(NUMBER,'-30',1,6061) +LexToken(ADDITION,'-',1,6061) +LexToken(NUMBER,'30',1,6062) LexToken(CLOSESQBRACKET,']',1,6064) LexToken(SEMICOLON,';',1,6065) LexToken(EOL,'\n',1,6066) @@ -1804,14 +1810,14 @@ LexToken(EOL,'\n',1,9183) LexToken(VAR,'dx',1,9188) LexToken(ASSIGNMENT,'=',1,9191) LexToken(VAR,'xmx',1,9193) -LexToken(OPERATOR,'-',1,9196) +LexToken(ADDITION,'-',1,9196) LexToken(VAR,'xmn',1,9197) LexToken(SEMICOLON,';',1,9200) LexToken(EOL,'\n',1,9201) LexToken(VAR,'dy',1,9206) LexToken(ASSIGNMENT,'=',1,9209) LexToken(VAR,'ymx',1,9211) -LexToken(OPERATOR,'-',1,9214) +LexToken(ADDITION,'-',1,9214) LexToken(VAR,'ymn',1,9215) LexToken(EOL,'\n',1,9218) LexToken(EOL,'\n',1,9219) @@ -1826,7 +1832,7 @@ LexToken(ASSIGNMENT,'=',1,9248) LexToken(VAR,'max',1,9249) LexToken(OPENBRACKET,'(',1,9252) LexToken(VAR,'xmx',1,9253) -LexToken(OPERATOR,'/',1,9256) +LexToken(MULTIPLICATION,'/',1,9256) LexToken(NUMBER,'2',1,9257) LexToken(COMMA,',',1,9258) LexToken(NUMBER,'1',1,9259) @@ -1839,9 +1845,9 @@ LexToken(EOL,'\n',1,9271) LexToken(VAR,'xmx',1,9276) LexToken(ASSIGNMENT,'=',1,9280) LexToken(VAR,'xmx',1,9282) -LexToken(OPERATOR,'+',1,9285) +LexToken(ADDITION,'+',1,9285) LexToken(VAR,'dx',1,9286) -LexToken(OPERATOR,'/',1,9288) +LexToken(MULTIPLICATION,'/',1,9288) LexToken(NUMBER,'50',1,9289) LexToken(SEMICOLON,';',1,9291) LexToken(EOL,'\n',1,9292) @@ -1857,7 +1863,7 @@ LexToken(ASSIGNMENT,'=',1,9322) LexToken(VAR,'max',1,9323) LexToken(OPENBRACKET,'(',1,9326) LexToken(VAR,'ymx',1,9327) -LexToken(OPERATOR,'/',1,9330) +LexToken(MULTIPLICATION,'/',1,9330) LexToken(NUMBER,'2',1,9331) LexToken(COMMA,',',1,9332) LexToken(NUMBER,'1',1,9333) @@ -1870,18 +1876,18 @@ LexToken(EOL,'\n',1,9345) LexToken(VAR,'ymn',1,9350) LexToken(ASSIGNMENT,'=',1,9354) LexToken(VAR,'ymn',1,9356) -LexToken(OPERATOR,'-',1,9359) +LexToken(ADDITION,'-',1,9359) LexToken(VAR,'dy',1,9360) -LexToken(OPERATOR,'/',1,9362) +LexToken(MULTIPLICATION,'/',1,9362) LexToken(NUMBER,'50',1,9363) LexToken(SEMICOLON,';',1,9365) LexToken(EOL,'\n',1,9366) LexToken(VAR,'ymx',1,9371) LexToken(ASSIGNMENT,'=',1,9375) LexToken(VAR,'ymx',1,9377) -LexToken(OPERATOR,'+',1,9380) +LexToken(ADDITION,'+',1,9380) LexToken(VAR,'dy',1,9381) -LexToken(OPERATOR,'/',1,9383) +LexToken(MULTIPLICATION,'/',1,9383) LexToken(NUMBER,'50',1,9384) LexToken(SEMICOLON,';',1,9386) LexToken(EOL,'\n',1,9387) @@ -2042,7 +2048,7 @@ LexToken(OPENBRACKET,'(',1,10037) LexToken(VAR,'menu_o',1,10038) LexToken(CLOSEBRACKET,')',1,10044) LexToken(CLOSEBRACKET,')',1,10045) -LexToken(OPERATOR,'+',1,10046) +LexToken(ADDITION,'+',1,10046) LexToken(VAR,'string',1,10047) LexToken(OPENBRACKET,'(',1,10053) LexToken(NUMBER,'1',1,10054) @@ -2054,7 +2060,7 @@ LexToken(COMMA,',',1,10067) LexToken(DQSTRING,'"*"',1,10070) LexToken(CLOSEBRACKET,')',1,10071) LexToken(CLOSEBRACKET,')',1,10072) -LexToken(OPERATOR,'+',1,10073) +LexToken(ADDITION,'+',1,10073) LexToken(VAR,'r',1,10074) LexToken(OPENBRACKET,'(',1,10075) LexToken(VAR,'ones',1,10076) @@ -2082,7 +2088,7 @@ LexToken(OPENBRACKET,'(',1,10136) LexToken(VAR,'menu_d',1,10137) LexToken(CLOSEBRACKET,')',1,10143) LexToken(CLOSEBRACKET,')',1,10144) -LexToken(OPERATOR,'+',1,10145) +LexToken(ADDITION,'+',1,10145) LexToken(VAR,'string',1,10146) LexToken(OPENBRACKET,'(',1,10152) LexToken(NUMBER,'1',1,10153) @@ -2094,7 +2100,7 @@ LexToken(COMMA,',',1,10166) LexToken(DQSTRING,'"*"',1,10169) LexToken(CLOSEBRACKET,')',1,10170) LexToken(CLOSEBRACKET,')',1,10171) -LexToken(OPERATOR,'+',1,10172) +LexToken(ADDITION,'+',1,10172) LexToken(VAR,'r',1,10173) LexToken(OPENBRACKET,'(',1,10174) LexToken(VAR,'ones',1,10175) @@ -2122,7 +2128,7 @@ LexToken(OPENBRACKET,'(',1,10236) LexToken(VAR,'menu_t',1,10237) LexToken(CLOSEBRACKET,')',1,10243) LexToken(CLOSEBRACKET,')',1,10244) -LexToken(OPERATOR,'+',1,10245) +LexToken(ADDITION,'+',1,10245) LexToken(VAR,'string',1,10246) LexToken(OPENBRACKET,'(',1,10252) LexToken(NUMBER,'1',1,10253) @@ -2134,7 +2140,7 @@ LexToken(COMMA,',',1,10266) LexToken(DQSTRING,'"*"',1,10269) LexToken(CLOSEBRACKET,')',1,10270) LexToken(CLOSEBRACKET,')',1,10271) -LexToken(OPERATOR,'+',1,10272) +LexToken(ADDITION,'+',1,10272) LexToken(VAR,'r',1,10273) LexToken(OPENBRACKET,'(',1,10274) LexToken(VAR,'ones',1,10275) @@ -2162,7 +2168,7 @@ LexToken(OPENBRACKET,'(',1,10335) LexToken(VAR,'menu_e',1,10336) LexToken(CLOSEBRACKET,')',1,10342) LexToken(CLOSEBRACKET,')',1,10343) -LexToken(OPERATOR,'+',1,10344) +LexToken(ADDITION,'+',1,10344) LexToken(VAR,'string',1,10345) LexToken(OPENBRACKET,'(',1,10351) LexToken(NUMBER,'1',1,10352) @@ -2174,7 +2180,7 @@ LexToken(COMMA,',',1,10365) LexToken(DQSTRING,'"*"',1,10368) LexToken(CLOSEBRACKET,')',1,10369) LexToken(CLOSEBRACKET,')',1,10370) -LexToken(OPERATOR,'+',1,10371) +LexToken(ADDITION,'+',1,10371) LexToken(VAR,'r',1,10372) LexToken(OPENBRACKET,'(',1,10373) LexToken(VAR,'ones',1,10374) @@ -2187,60 +2193,60 @@ LexToken(EOL,'\n',1,10388) LexToken(VAR,'execstr',1,10393) LexToken(OPENBRACKET,'(',1,10400) LexToken(DQSTRING,'"Autoscale_"',1,10412) -LexToken(OPERATOR,'+',1,10413) +LexToken(ADDITION,'+',1,10413) LexToken(VAR,'string',1,10414) LexToken(OPENBRACKET,'(',1,10420) LexToken(VAR,'curwin',1,10421) LexToken(CLOSEBRACKET,')',1,10427) -LexToken(OPERATOR,'+',1,10428) +LexToken(ADDITION,'+',1,10428) LexToken(DQSTRING,'"=scam"',1,10435) LexToken(CLOSEBRACKET,')',1,10436) LexToken(EOL,'\n',1,10437) LexToken(VAR,'execstr',1,10442) LexToken(OPENBRACKET,'(',1,10449) LexToken(DQSTRING,'"Spline_"',1,10458) -LexToken(OPERATOR,'+',1,10459) +LexToken(ADDITION,'+',1,10459) LexToken(VAR,'string',1,10460) LexToken(OPENBRACKET,'(',1,10466) LexToken(VAR,'curwin',1,10467) LexToken(CLOSEBRACKET,')',1,10473) -LexToken(OPERATOR,'+',1,10474) +LexToken(ADDITION,'+',1,10474) LexToken(DQSTRING,'"=Orderm"',1,10483) LexToken(CLOSEBRACKET,')',1,10484) LexToken(EOL,'\n',1,10485) LexToken(VAR,'execstr',1,10490) LexToken(OPENBRACKET,'(',1,10497) LexToken(DQSTRING,'"Data_"',1,10504) -LexToken(OPERATOR,'+',1,10505) +LexToken(ADDITION,'+',1,10505) LexToken(VAR,'string',1,10506) LexToken(OPENBRACKET,'(',1,10512) LexToken(VAR,'curwin',1,10513) LexToken(CLOSEBRACKET,')',1,10519) -LexToken(OPERATOR,'+',1,10520) +LexToken(ADDITION,'+',1,10520) LexToken(DQSTRING,'"=Datam"',1,10528) LexToken(CLOSEBRACKET,')',1,10529) LexToken(EOL,'\n',1,10530) LexToken(VAR,'execstr',1,10535) LexToken(OPENBRACKET,'(',1,10542) LexToken(DQSTRING,'"Standards_"',1,10554) -LexToken(OPERATOR,'+',1,10555) +LexToken(ADDITION,'+',1,10555) LexToken(VAR,'string',1,10556) LexToken(OPENBRACKET,'(',1,10562) LexToken(VAR,'curwin',1,10563) LexToken(CLOSEBRACKET,')',1,10569) -LexToken(OPERATOR,'+',1,10570) +LexToken(ADDITION,'+',1,10570) LexToken(DQSTRING,'"=Standm"',1,10579) LexToken(CLOSEBRACKET,')',1,10580) LexToken(EOL,'\n',1,10581) LexToken(VAR,'execstr',1,10586) LexToken(OPENBRACKET,'(',1,10593) LexToken(DQSTRING,'"Exit_"',1,10600) -LexToken(OPERATOR,'+',1,10601) +LexToken(ADDITION,'+',1,10601) LexToken(VAR,'string',1,10602) LexToken(OPENBRACKET,'(',1,10608) LexToken(VAR,'curwin',1,10609) LexToken(CLOSEBRACKET,')',1,10615) -LexToken(OPERATOR,'+',1,10616) +LexToken(ADDITION,'+',1,10616) LexToken(DQSTRING,'"=Exitm"',1,10624) LexToken(CLOSEBRACKET,')',1,10625) LexToken(EOL,'\n',1,10626) @@ -2403,7 +2409,8 @@ LexToken(NUMBER,'2',1,11141) LexToken(CLOSEBRACKET,')',1,11142) LexToken(COMMA,',',1,11143) LexToken(OPENSQBRACKET,'[',1,11144) -LexToken(NUMBER,'-1',1,11145) +LexToken(ADDITION,'-',1,11145) +LexToken(NUMBER,'1',1,11146) LexToken(CLOSESQBRACKET,']',1,11147) LexToken(CLOSEBRACKET,')',1,11148) LexToken(SEMICOLON,';',1,11149) @@ -3138,9 +3145,9 @@ LexToken(OPENBRACKET,'(',1,14956) LexToken(NUMBER,'0',1,14957) LexToken(COMMA,',',1,14958) LexToken(PREVAR_FLOAT,'%pi',1,14959) -LexToken(OPERATOR,'*',1,14962) +LexToken(MULTIPLICATION,'*',1,14962) LexToken(NUMBER,'2',1,14963) -LexToken(OPERATOR,'/',1,14964) +LexToken(MULTIPLICATION,'/',1,14964) LexToken(VAR,'wp',1,14965) LexToken(COMMA,',',1,14967) LexToken(VAR,'np1',1,14968) @@ -3151,16 +3158,16 @@ LexToken(EOL,'\n',1,14974) LexToken(VAR,'yt',1,14991) LexToken(ASSIGNMENT,'=',1,14993) LexToken(VAR,'Amp',1,14994) -LexToken(OPERATOR,'*',1,14997) +LexToken(MULTIPLICATION,'*',1,14997) LexToken(VAR,'sin',1,14998) LexToken(OPENBRACKET,'(',1,15001) LexToken(VAR,'wp',1,15002) -LexToken(OPERATOR,'*',1,15004) +LexToken(MULTIPLICATION,'*',1,15004) LexToken(VAR,'xt',1,15005) -LexToken(OPERATOR,'+',1,15007) +LexToken(ADDITION,'+',1,15007) LexToken(VAR,'phase',1,15008) LexToken(CLOSEBRACKET,')',1,15013) -LexToken(OPERATOR,'+',1,15014) +LexToken(ADDITION,'+',1,15014) LexToken(VAR,'offset',1,15015) LexToken(SEMICOLON,';',1,15021) LexToken(EOL,'\n',1,15022) @@ -3417,7 +3424,7 @@ LexToken(ASSIGNMENT,'=',1,16318) LexToken(OPENSQBRACKET,'[',1,16319) LexToken(VAR,'sAmp2',1,16320) LexToken(SEMICOLON,';',1,16325) -LexToken(OPERATOR,'-',1,16326) +LexToken(ADDITION,'-',1,16326) LexToken(VAR,'sAmp2',1,16327) LexToken(CLOSESQBRACKET,']',1,16332) LexToken(SEMICOLON,';',1,16333) @@ -3486,7 +3493,7 @@ LexToken(SEMICOLON,';',1,16711) LexToken(DQSTRING,'"Period (sec)"',1,16725) LexToken(SEMICOLON,';',1,16726) LexToken(DQSTRING,'"Pulse width(% o"',1,16743) -LexToken(OPERATOR,'+',1,16744) +LexToken(ADDITION,'+',1,16744) LexToken(DQSTRING,'"f period)"',1,16771) LexToken(SEMICOLON,';',1,16772) LexToken(DQSTRING,'"Phase delay (sec)"',1,16791) @@ -3597,11 +3604,11 @@ LexToken(SEMICOLON,';',1,17310) LexToken(VAR,'Pd3',1,17311) LexToken(SEMICOLON,';',1,17314) LexToken(VAR,'Pw3',1,17316) -LexToken(OPERATOR,'*',1,17319) +LexToken(MULTIPLICATION,'*',1,17319) LexToken(VAR,'Tp3',1,17320) -LexToken(OPERATOR,'/',1,17323) +LexToken(MULTIPLICATION,'/',1,17323) LexToken(NUMBER,'100',1,17324) -LexToken(OPERATOR,'+',1,17327) +LexToken(ADDITION,'+',1,17327) LexToken(VAR,'Pd3',1,17328) LexToken(SEMICOLON,';',1,17331) LexToken(VAR,'Tp3',1,17332) @@ -3614,7 +3621,7 @@ LexToken(OPENSQBRACKET,'[',1,17365) LexToken(VAR,'yt',1,17366) LexToken(SEMICOLON,';',1,17368) LexToken(VAR,'Amp3',1,17369) -LexToken(OPERATOR,'+',1,17373) +LexToken(ADDITION,'+',1,17373) LexToken(VAR,'Bias3',1,17374) LexToken(SEMICOLON,';',1,17379) LexToken(VAR,'Bias3',1,17380) @@ -3805,10 +3812,11 @@ LexToken(COLON,':',1,18320) LexToken(VAR,'sample4',1,18321) LexToken(COLON,':',1,18328) LexToken(VAR,'sample4',1,18329) -LexToken(OPERATOR,'*',1,18336) +LexToken(MULTIPLICATION,'*',1,18336) LexToken(OPENBRACKET,'(',1,18337) LexToken(VAR,'np4',1,18338) -LexToken(NUMBER,'-1',1,18341) +LexToken(ADDITION,'-',1,18341) +LexToken(NUMBER,'1',1,18342) LexToken(CLOSEBRACKET,')',1,18343) LexToken(SEMICOLON,';',1,18344) LexToken(EOL,'\n',1,18345) @@ -3823,12 +3831,12 @@ LexToken(EOL,'\n',1,18371) LexToken(VAR,'yt',1,18388) LexToken(ASSIGNMENT,'=',1,18390) LexToken(VAR,'mean4',1,18391) -LexToken(OPERATOR,'+',1,18396) +LexToken(ADDITION,'+',1,18396) LexToken(VAR,'sqrt',1,18397) LexToken(OPENBRACKET,'(',1,18401) LexToken(VAR,'var4',1,18402) LexToken(CLOSEBRACKET,')',1,18406) -LexToken(OPERATOR,'*',1,18407) +LexToken(MULTIPLICATION,'*',1,18407) LexToken(VAR,'rand',1,18408) LexToken(OPENBRACKET,'(',1,18412) LexToken(VAR,'np4',1,18413) @@ -3976,10 +3984,11 @@ LexToken(COLON,':',1,19153) LexToken(VAR,'sample5',1,19154) LexToken(COLON,':',1,19161) LexToken(VAR,'sample5',1,19162) -LexToken(OPERATOR,'*',1,19169) +LexToken(MULTIPLICATION,'*',1,19169) LexToken(OPENBRACKET,'(',1,19170) LexToken(VAR,'np5',1,19171) -LexToken(NUMBER,'-1',1,19174) +LexToken(ADDITION,'-',1,19174) +LexToken(NUMBER,'1',1,19175) LexToken(CLOSEBRACKET,')',1,19176) LexToken(SEMICOLON,';',1,19177) LexToken(EOL,'\n',1,19178) @@ -3994,13 +4003,13 @@ LexToken(EOL,'\n',1,19204) LexToken(VAR,'yt',1,19221) LexToken(ASSIGNMENT,'=',1,19223) LexToken(VAR,'min5',1,19224) -LexToken(OPERATOR,'+',1,19228) +LexToken(ADDITION,'+',1,19228) LexToken(OPENBRACKET,'(',1,19229) LexToken(VAR,'max5',1,19230) -LexToken(OPERATOR,'-',1,19234) +LexToken(ADDITION,'-',1,19234) LexToken(VAR,'min5',1,19235) LexToken(CLOSEBRACKET,')',1,19239) -LexToken(OPERATOR,'*',1,19240) +LexToken(MULTIPLICATION,'*',1,19240) LexToken(VAR,'rand',1,19241) LexToken(OPENBRACKET,'(',1,19245) LexToken(VAR,'np5',1,19246) @@ -4299,11 +4308,13 @@ LexToken(VAR,'list',1,20803) LexToken(OPENBRACKET,'(',1,20807) LexToken(DQSTRING,'"vec"',1,20812) LexToken(COMMA,',',1,20813) -LexToken(NUMBER,'-1',1,20814) +LexToken(ADDITION,'-',1,20814) +LexToken(NUMBER,'1',1,20815) LexToken(COMMA,',',1,20816) LexToken(DQSTRING,'"vec"',1,20821) LexToken(COMMA,',',1,20822) -LexToken(NUMBER,'-1',1,20823) +LexToken(ADDITION,'-',1,20823) +LexToken(NUMBER,'1',1,20824) LexToken(CLOSEBRACKET,')',1,20825) LexToken(COMMA,',',1,20826) LexToken(VAR,'list',1,20827) @@ -4637,35 +4648,35 @@ LexToken(ASSIGNMENT,'=',1,22835) LexToken(OPENBRACKET,'(',1,22836) LexToken(OPENBRACKET,'(',1,22837) LexToken(VAR,'xt',1,22838) -LexToken(OPERATOR,'-',1,22840) +LexToken(ADDITION,'-',1,22840) LexToken(VAR,'ones',1,22841) LexToken(OPENBRACKET,'(',1,22845) LexToken(VAR,'N',1,22846) LexToken(COMMA,',',1,22847) LexToken(NUMBER,'1',1,22848) LexToken(CLOSEBRACKET,')',1,22849) -LexToken(OPERATOR,'*',1,22850) +LexToken(MULTIPLICATION,'*',1,22850) LexToken(VAR,'xc',1,22851) LexToken(CLOSEBRACKET,')',1,22853) LexToken(CLOSEBRACKET,')',1,22854) -LexToken(OPERATOR,'^',1,22855) +LexToken(MULTIPLICATION,'^',1,22855) LexToken(NUMBER,'2',1,22856) -LexToken(OPERATOR,'+',1,22857) +LexToken(ADDITION,'+',1,22857) LexToken(OPENBRACKET,'(',1,22858) LexToken(OPENBRACKET,'(',1,22859) LexToken(VAR,'yt',1,22860) -LexToken(OPERATOR,'-',1,22862) +LexToken(ADDITION,'-',1,22862) LexToken(VAR,'ones',1,22863) LexToken(OPENBRACKET,'(',1,22867) LexToken(VAR,'N',1,22868) LexToken(COMMA,',',1,22869) LexToken(NUMBER,'1',1,22870) LexToken(CLOSEBRACKET,')',1,22871) -LexToken(OPERATOR,'*',1,22872) +LexToken(MULTIPLICATION,'*',1,22872) LexToken(VAR,'yc',1,22873) LexToken(CLOSEBRACKET,')',1,22875) LexToken(CLOSEBRACKET,')',1,22876) -LexToken(OPERATOR,'^',1,22877) +LexToken(MULTIPLICATION,'^',1,22877) LexToken(NUMBER,'2',1,22878) LexToken(EOL,'\n',1,22879) LexToken(OPENSQBRACKET,'[',1,22896) @@ -4697,7 +4708,7 @@ LexToken(NUMBER,'2',1,22981) LexToken(COMMA,',',1,22982) LexToken(NUMBER,'1',1,22983) LexToken(CLOSEBRACKET,')',1,22984) -LexToken(OPERATOR,'-',1,22985) +LexToken(ADDITION,'-',1,22985) LexToken(VAR,'rectx',1,22986) LexToken(OPENBRACKET,'(',1,22991) LexToken(NUMBER,'1',1,22992) @@ -4705,7 +4716,7 @@ LexToken(COMMA,',',1,22993) LexToken(NUMBER,'1',1,22994) LexToken(CLOSEBRACKET,')',1,22995) LexToken(CLOSEBRACKET,')',1,22996) -LexToken(OPERATOR,'/',1,22997) +LexToken(MULTIPLICATION,'/',1,22997) LexToken(NUMBER,'80',1,22998) LexToken(SEMICOLON,';',1,23000) LexToken(EOL,'\n',1,23001) @@ -4719,7 +4730,7 @@ LexToken(NUMBER,'2',1,23031) LexToken(COMMA,',',1,23032) LexToken(NUMBER,'2',1,23033) LexToken(CLOSEBRACKET,')',1,23034) -LexToken(OPERATOR,'-',1,23035) +LexToken(ADDITION,'-',1,23035) LexToken(VAR,'rectx',1,23036) LexToken(OPENBRACKET,'(',1,23041) LexToken(NUMBER,'1',1,23042) @@ -4727,7 +4738,7 @@ LexToken(COMMA,',',1,23043) LexToken(NUMBER,'2',1,23044) LexToken(CLOSEBRACKET,')',1,23045) LexToken(CLOSEBRACKET,')',1,23046) -LexToken(OPERATOR,'/',1,23047) +LexToken(MULTIPLICATION,'/',1,23047) LexToken(NUMBER,'80',1,23048) LexToken(SEMICOLON,';',1,23050) LexToken(EOL,'\n',1,23051) @@ -4736,7 +4747,7 @@ LexToken(OPENBRACKET,'(',1,23071) LexToken(VAR,'abs',1,23072) LexToken(OPENBRACKET,'(',1,23075) LexToken(VAR,'xc',1,23076) -LexToken(OPERATOR,'-',1,23078) +LexToken(ADDITION,'-',1,23078) LexToken(VAR,'xt',1,23079) LexToken(OPENBRACKET,'(',1,23081) LexToken(VAR,'k',1,23082) @@ -4748,7 +4759,7 @@ LexToken(LOGICAL,'&',1,23089) LexToken(VAR,'abs',1,23091) LexToken(OPENBRACKET,'(',1,23094) LexToken(VAR,'yc',1,23095) -LexToken(OPERATOR,'-',1,23097) +LexToken(ADDITION,'-',1,23097) LexToken(VAR,'yt',1,23098) LexToken(OPENBRACKET,'(',1,23100) LexToken(VAR,'k',1,23101) @@ -5306,14 +5317,14 @@ LexToken(EOL,'\n',1,25412) LexToken(VAR,'PERIODIC',1,25421) LexToken(ASSIGNMENT,'=',1,25429) LexToken(DQSTRING,'"periodic, T="',1,25443) -LexToken(OPERATOR,'+',1,25444) +LexToken(ADDITION,'+',1,25444) LexToken(VAR,'string',1,25445) LexToken(OPENBRACKET,'(',1,25451) LexToken(VAR,'x',1,25452) LexToken(OPENBRACKET,'(',1,25453) LexToken(VAR,'N',1,25454) LexToken(CLOSEBRACKET,')',1,25455) -LexToken(OPERATOR,'-',1,25456) +LexToken(ADDITION,'-',1,25456) LexToken(VAR,'x',1,25457) LexToken(OPENBRACKET,'(',1,25458) LexToken(NUMBER,'1',1,25459) @@ -5341,15 +5352,15 @@ LexToken(VAR,'string',1,25529) LexToken(OPENBRACKET,'(',1,25535) LexToken(VAR,'N',1,25536) LexToken(CLOSEBRACKET,')',1,25537) -LexToken(OPERATOR,'+',1,25538) +LexToken(ADDITION,'+',1,25538) LexToken(DQSTRING,'" points, "',1,25550) -LexToken(OPERATOR,'+',1,25551) +LexToken(ADDITION,'+',1,25551) LexToken(DQSTRING,'"Method: "',1,25561) -LexToken(OPERATOR,'+',1,25562) +LexToken(ADDITION,'+',1,25562) LexToken(VAR,'METHOD',1,25563) -LexToken(OPERATOR,'+',1,25569) +LexToken(ADDITION,'+',1,25569) LexToken(DQSTRING,'", "',1,25574) -LexToken(OPERATOR,'+',1,25575) +LexToken(ADDITION,'+',1,25575) LexToken(VAR,'PERIODIC',1,25576) LexToken(CLOSESQBRACKET,']',1,25584) LexToken(SEMICOLON,';',1,25585) @@ -5715,7 +5726,8 @@ LexToken(EOL,'\n',1,26693) LexToken(EOL,'\n',1,26694) LexToken(VAR,'btn',1,26699) LexToken(ASSIGNMENT,'=',1,26702) -LexToken(NUMBER,'-1',1,26703) +LexToken(ADDITION,'-',1,26703) +LexToken(NUMBER,'1',1,26704) LexToken(EOL,'\n',1,26705) LexToken(EOL,'\n',1,26706) LexToken(WHILE,'while',1,26711) @@ -5735,7 +5747,8 @@ LexToken(NUMBER,'10',1,26741) LexToken(LOGICAL,'|',1,26743) LexToken(VAR,'btn',1,26745) LexToken(COMPARISON,'==',1,26748) -LexToken(NUMBER,'-5',1,26750) +LexToken(ADDITION,'-',1,26750) +LexToken(NUMBER,'5',1,26751) LexToken(CLOSEBRACKET,')',1,26752) LexToken(EOL,'\n',1,26753) LexToken(VAR,'rep',1,26762) @@ -6117,14 +6130,14 @@ LexToken(EOL,'\n',1,27836) LexToken(VAR,'dx',1,27841) LexToken(ASSIGNMENT,'=',1,27843) LexToken(VAR,'XMX',1,27844) -LexToken(OPERATOR,'-',1,27847) +LexToken(ADDITION,'-',1,27847) LexToken(VAR,'XMN',1,27848) LexToken(SEMICOLON,';',1,27851) LexToken(EOL,'\n',1,27852) LexToken(VAR,'dy',1,27857) LexToken(ASSIGNMENT,'=',1,27859) LexToken(VAR,'YMX',1,27860) -LexToken(OPERATOR,'-',1,27863) +LexToken(ADDITION,'-',1,27863) LexToken(VAR,'YMN',1,27864) LexToken(EOL,'\n',1,27867) LexToken(IF,'if',1,27872) @@ -6138,7 +6151,7 @@ LexToken(ASSIGNMENT,'=',1,27896) LexToken(VAR,'max',1,27897) LexToken(OPENBRACKET,'(',1,27900) LexToken(VAR,'XMX',1,27901) -LexToken(OPERATOR,'/',1,27904) +LexToken(MULTIPLICATION,'/',1,27904) LexToken(NUMBER,'2',1,27905) LexToken(COMMA,',',1,27906) LexToken(NUMBER,'1',1,27907) @@ -6151,9 +6164,9 @@ LexToken(EOL,'\n',1,27919) LexToken(VAR,'XMX',1,27924) LexToken(ASSIGNMENT,'=',1,27927) LexToken(VAR,'XMX',1,27928) -LexToken(OPERATOR,'+',1,27931) +LexToken(ADDITION,'+',1,27931) LexToken(VAR,'dx',1,27932) -LexToken(OPERATOR,'/',1,27934) +LexToken(MULTIPLICATION,'/',1,27934) LexToken(NUMBER,'50',1,27935) LexToken(EOL,'\n',1,27937) LexToken(IF,'if',1,27942) @@ -6167,7 +6180,7 @@ LexToken(ASSIGNMENT,'=',1,27966) LexToken(VAR,'max',1,27967) LexToken(OPENBRACKET,'(',1,27970) LexToken(VAR,'YMX',1,27971) -LexToken(OPERATOR,'/',1,27974) +LexToken(MULTIPLICATION,'/',1,27974) LexToken(NUMBER,'2',1,27975) LexToken(COMMA,',',1,27976) LexToken(NUMBER,'1',1,27977) @@ -6180,18 +6193,18 @@ LexToken(EOL,'\n',1,27989) LexToken(VAR,'YMN',1,27994) LexToken(ASSIGNMENT,'=',1,27997) LexToken(VAR,'YMN',1,27998) -LexToken(OPERATOR,'-',1,28001) +LexToken(ADDITION,'-',1,28001) LexToken(VAR,'dy',1,28002) -LexToken(OPERATOR,'/',1,28004) +LexToken(MULTIPLICATION,'/',1,28004) LexToken(NUMBER,'50',1,28005) LexToken(SEMICOLON,';',1,28007) LexToken(EOL,'\n',1,28008) LexToken(VAR,'YMX',1,28013) LexToken(ASSIGNMENT,'=',1,28016) LexToken(VAR,'YMX',1,28017) -LexToken(OPERATOR,'+',1,28020) +LexToken(ADDITION,'+',1,28020) LexToken(VAR,'dy',1,28021) -LexToken(OPERATOR,'/',1,28023) +LexToken(MULTIPLICATION,'/',1,28023) LexToken(NUMBER,'50',1,28024) LexToken(SEMICOLON,';',1,28026) LexToken(EOL,'\n',1,28027) @@ -6391,7 +6404,7 @@ LexToken(OPENSQBRACKET,'[',1,28564) LexToken(DQSTRING,'"Filename"',1,28574) LexToken(SEMICOLON,';',1,28575) LexToken(DQSTRING,'"Sheet #"',1,28584) -LexToken(OPERATOR,'+',1,28585) +LexToken(ADDITION,'+',1,28585) LexToken(DQSTRING,'" "',1,28600) LexToken(SEMICOLON,';',1,28601) LexToken(DQSTRING,'"X[start:Stop]"',1,28616) @@ -6473,7 +6486,7 @@ LexToken(EOL,'\n',1,28904) LexToken(VAR,'xinfo',1,28917) LexToken(OPENBRACKET,'(',1,28922) LexToken(DQSTRING,'"Scicos cannot find the excel file:"',1,28958) -LexToken(OPERATOR,'+',1,28959) +LexToken(ADDITION,'+',1,28959) LexToken(VAR,'filen',1,28960) LexToken(CLOSEBRACKET,')',1,28965) LexToken(SEMICOLON,';',1,28966) @@ -6587,7 +6600,8 @@ LexToken(COMMA,',',1,29360) LexToken(NUMBER,'1',1,29361) LexToken(COLON,':',1,29362) LexToken(VAR,'px',1,29363) -LexToken(NUMBER,'-1',1,29365) +LexToken(ADDITION,'-',1,29365) +LexToken(NUMBER,'1',1,29366) LexToken(CLOSEBRACKET,')',1,29367) LexToken(SEMICOLON,';',1,29368) LexToken(EOL,'\n',1,29369) @@ -6598,7 +6612,7 @@ LexToken(OPENBRACKET,'(',1,29389) LexToken(VAR,'xa',1,29390) LexToken(COMMA,',',1,29392) LexToken(VAR,'px',1,29393) -LexToken(OPERATOR,'+',1,29395) +LexToken(ADDITION,'+',1,29395) LexToken(NUMBER,'1',1,29396) LexToken(COLON,':',1,29397) LexToken(VAR,'length',1,29398) @@ -6617,7 +6631,8 @@ LexToken(COMMA,',',1,29433) LexToken(NUMBER,'1',1,29434) LexToken(COLON,':',1,29435) LexToken(VAR,'py',1,29436) -LexToken(NUMBER,'-1',1,29438) +LexToken(ADDITION,'-',1,29438) +LexToken(NUMBER,'1',1,29439) LexToken(CLOSEBRACKET,')',1,29440) LexToken(SEMICOLON,';',1,29441) LexToken(EOL,'\n',1,29442) @@ -6628,7 +6643,7 @@ LexToken(OPENBRACKET,'(',1,29462) LexToken(VAR,'ya',1,29463) LexToken(COMMA,',',1,29465) LexToken(VAR,'py',1,29466) -LexToken(OPERATOR,'+',1,29468) +LexToken(ADDITION,'+',1,29468) LexToken(NUMBER,'1',1,29469) LexToken(COLON,':',1,29470) LexToken(VAR,'length',1,29471) @@ -6663,7 +6678,7 @@ LexToken(EOL,'\n',1,29551) LexToken(VAR,'xinfo',1,29568) LexToken(OPENBRACKET,'(',1,29573) LexToken(DQSTRING,'"Bad address in X:"',1,29592) -LexToken(OPERATOR,'+',1,29593) +LexToken(ADDITION,'+',1,29593) LexToken(VAR,'x1',1,29594) LexToken(CLOSEBRACKET,')',1,29596) LexToken(SEMICOLON,';',1,29597) @@ -6682,7 +6697,8 @@ LexToken(COMMA,',',1,29661) LexToken(NUMBER,'1',1,29662) LexToken(COLON,':',1,29663) LexToken(VAR,'x1p',1,29664) -LexToken(NUMBER,'-1',1,29667) +LexToken(ADDITION,'-',1,29667) +LexToken(NUMBER,'1',1,29668) LexToken(CLOSEBRACKET,')',1,29669) LexToken(SEMICOLON,';',1,29670) LexToken(EOL,'\n',1,29671) @@ -6726,7 +6742,7 @@ LexToken(EOL,'\n',1,29780) LexToken(VAR,'xinfo',1,29797) LexToken(OPENBRACKET,'(',1,29802) LexToken(DQSTRING,'"Bad address in X:"',1,29821) -LexToken(OPERATOR,'+',1,29822) +LexToken(ADDITION,'+',1,29822) LexToken(VAR,'x2',1,29823) LexToken(CLOSEBRACKET,')',1,29825) LexToken(SEMICOLON,';',1,29826) @@ -6746,7 +6762,8 @@ LexToken(COMMA,',',1,29887) LexToken(NUMBER,'1',1,29888) LexToken(COLON,':',1,29889) LexToken(VAR,'x2p',1,29890) -LexToken(NUMBER,'-1',1,29893) +LexToken(ADDITION,'-',1,29893) +LexToken(NUMBER,'1',1,29894) LexToken(CLOSEBRACKET,')',1,29895) LexToken(SEMICOLON,';',1,29896) LexToken(EOL,'\n',1,29897) @@ -6790,7 +6807,7 @@ LexToken(EOL,'\n',1,30006) LexToken(VAR,'xinfo',1,30023) LexToken(OPENBRACKET,'(',1,30028) LexToken(DQSTRING,'"Bad address in Y:"',1,30047) -LexToken(OPERATOR,'+',1,30048) +LexToken(ADDITION,'+',1,30048) LexToken(VAR,'y1',1,30049) LexToken(CLOSEBRACKET,')',1,30051) LexToken(SEMICOLON,';',1,30052) @@ -6809,7 +6826,8 @@ LexToken(COMMA,',',1,30116) LexToken(NUMBER,'1',1,30117) LexToken(COLON,':',1,30118) LexToken(VAR,'y1p',1,30119) -LexToken(NUMBER,'-1',1,30122) +LexToken(ADDITION,'-',1,30122) +LexToken(NUMBER,'1',1,30123) LexToken(CLOSEBRACKET,')',1,30124) LexToken(SEMICOLON,';',1,30125) LexToken(EOL,'\n',1,30126) @@ -6853,7 +6871,7 @@ LexToken(EOL,'\n',1,30235) LexToken(VAR,'xinfo',1,30252) LexToken(OPENBRACKET,'(',1,30257) LexToken(DQSTRING,'"Bad address in Y:"',1,30276) -LexToken(OPERATOR,'+',1,30277) +LexToken(ADDITION,'+',1,30277) LexToken(VAR,'y2',1,30278) LexToken(CLOSEBRACKET,')',1,30280) LexToken(SEMICOLON,';',1,30281) @@ -6872,7 +6890,8 @@ LexToken(COMMA,',',1,30345) LexToken(NUMBER,'1',1,30346) LexToken(COLON,':',1,30347) LexToken(VAR,'y2p',1,30348) -LexToken(NUMBER,'-1',1,30351) +LexToken(ADDITION,'-',1,30351) +LexToken(NUMBER,'1',1,30352) LexToken(CLOSEBRACKET,')',1,30353) LexToken(SEMICOLON,';',1,30354) LexToken(EOL,'\n',1,30355) @@ -6941,7 +6960,7 @@ LexToken(EOL,'\n',1,30595) LexToken(VAR,'xstC',1,30612) LexToken(ASSIGNMENT,'=',1,30616) LexToken(VAR,'xstC',1,30617) -LexToken(OPERATOR,'+',1,30621) +LexToken(ADDITION,'+',1,30621) LexToken(VAR,'modulo',1,30622) LexToken(OPENBRACKET,'(',1,30628) LexToken(VAR,'find',1,30629) @@ -6953,21 +6972,22 @@ LexToken(OPENBRACKET,'(',1,30642) LexToken(VAR,'x11',1,30643) LexToken(COMMA,',',1,30646) LexToken(VAR,'lx11',1,30647) -LexToken(OPERATOR,'-',1,30651) +LexToken(ADDITION,'-',1,30651) LexToken(VAR,'i',1,30652) -LexToken(OPERATOR,'+',1,30653) +LexToken(ADDITION,'+',1,30653) LexToken(NUMBER,'1',1,30654) LexToken(CLOSEBRACKET,')',1,30655) LexToken(CLOSEBRACKET,')',1,30656) LexToken(COMMA,',',1,30657) LexToken(NUMBER,'26',1,30658) LexToken(CLOSEBRACKET,')',1,30660) -LexToken(OPERATOR,'*',1,30661) +LexToken(MULTIPLICATION,'*',1,30661) LexToken(NUMBER,'26',1,30662) -LexToken(OPERATOR,'^',1,30664) +LexToken(MULTIPLICATION,'^',1,30664) LexToken(OPENBRACKET,'(',1,30665) LexToken(VAR,'i',1,30666) -LexToken(NUMBER,'-1',1,30667) +LexToken(ADDITION,'-',1,30667) +LexToken(NUMBER,'1',1,30668) LexToken(CLOSEBRACKET,')',1,30669) LexToken(SEMICOLON,';',1,30670) LexToken(EOL,'\n',1,30671) @@ -6989,7 +7009,7 @@ LexToken(EOL,'\n',1,30733) LexToken(VAR,'xenC',1,30750) LexToken(ASSIGNMENT,'=',1,30754) LexToken(VAR,'xenC',1,30755) -LexToken(OPERATOR,'+',1,30759) +LexToken(ADDITION,'+',1,30759) LexToken(VAR,'modulo',1,30760) LexToken(OPENBRACKET,'(',1,30766) LexToken(VAR,'find',1,30767) @@ -7001,21 +7021,22 @@ LexToken(OPENBRACKET,'(',1,30780) LexToken(VAR,'x21',1,30781) LexToken(COMMA,',',1,30784) LexToken(VAR,'lx21',1,30785) -LexToken(OPERATOR,'-',1,30789) +LexToken(ADDITION,'-',1,30789) LexToken(VAR,'i',1,30790) -LexToken(OPERATOR,'+',1,30791) +LexToken(ADDITION,'+',1,30791) LexToken(NUMBER,'1',1,30792) LexToken(CLOSEBRACKET,')',1,30793) LexToken(CLOSEBRACKET,')',1,30794) LexToken(COMMA,',',1,30795) LexToken(NUMBER,'26',1,30796) LexToken(CLOSEBRACKET,')',1,30798) -LexToken(OPERATOR,'*',1,30799) +LexToken(MULTIPLICATION,'*',1,30799) LexToken(NUMBER,'26',1,30800) -LexToken(OPERATOR,'^',1,30802) +LexToken(MULTIPLICATION,'^',1,30802) LexToken(OPENBRACKET,'(',1,30803) LexToken(VAR,'i',1,30804) -LexToken(NUMBER,'-1',1,30805) +LexToken(ADDITION,'-',1,30805) +LexToken(NUMBER,'1',1,30806) LexToken(CLOSEBRACKET,')',1,30807) LexToken(SEMICOLON,';',1,30808) LexToken(EOL,'\n',1,30809) @@ -7037,7 +7058,7 @@ LexToken(EOL,'\n',1,30871) LexToken(VAR,'ystC',1,30888) LexToken(ASSIGNMENT,'=',1,30892) LexToken(VAR,'ystC',1,30893) -LexToken(OPERATOR,'+',1,30897) +LexToken(ADDITION,'+',1,30897) LexToken(VAR,'modulo',1,30898) LexToken(OPENBRACKET,'(',1,30904) LexToken(VAR,'find',1,30905) @@ -7049,21 +7070,22 @@ LexToken(OPENBRACKET,'(',1,30918) LexToken(VAR,'y11',1,30919) LexToken(COMMA,',',1,30922) LexToken(VAR,'ly11',1,30923) -LexToken(OPERATOR,'-',1,30927) +LexToken(ADDITION,'-',1,30927) LexToken(VAR,'i',1,30928) -LexToken(OPERATOR,'+',1,30929) +LexToken(ADDITION,'+',1,30929) LexToken(NUMBER,'1',1,30930) LexToken(CLOSEBRACKET,')',1,30931) LexToken(CLOSEBRACKET,')',1,30932) LexToken(COMMA,',',1,30933) LexToken(NUMBER,'26',1,30934) LexToken(CLOSEBRACKET,')',1,30936) -LexToken(OPERATOR,'*',1,30937) +LexToken(MULTIPLICATION,'*',1,30937) LexToken(NUMBER,'26',1,30938) -LexToken(OPERATOR,'^',1,30940) +LexToken(MULTIPLICATION,'^',1,30940) LexToken(OPENBRACKET,'(',1,30941) LexToken(VAR,'i',1,30942) -LexToken(NUMBER,'-1',1,30943) +LexToken(ADDITION,'-',1,30943) +LexToken(NUMBER,'1',1,30944) LexToken(CLOSEBRACKET,')',1,30945) LexToken(SEMICOLON,';',1,30946) LexToken(EOL,'\n',1,30947) @@ -7085,7 +7107,7 @@ LexToken(EOL,'\n',1,31009) LexToken(VAR,'yenC',1,31026) LexToken(ASSIGNMENT,'=',1,31030) LexToken(VAR,'yenC',1,31031) -LexToken(OPERATOR,'+',1,31035) +LexToken(ADDITION,'+',1,31035) LexToken(VAR,'modulo',1,31036) LexToken(OPENBRACKET,'(',1,31042) LexToken(VAR,'find',1,31043) @@ -7097,21 +7119,22 @@ LexToken(OPENBRACKET,'(',1,31056) LexToken(VAR,'y21',1,31057) LexToken(COMMA,',',1,31060) LexToken(VAR,'ly21',1,31061) -LexToken(OPERATOR,'-',1,31065) +LexToken(ADDITION,'-',1,31065) LexToken(VAR,'i',1,31066) -LexToken(OPERATOR,'+',1,31067) +LexToken(ADDITION,'+',1,31067) LexToken(NUMBER,'1',1,31068) LexToken(CLOSEBRACKET,')',1,31069) LexToken(CLOSEBRACKET,')',1,31070) LexToken(COMMA,',',1,31071) LexToken(NUMBER,'26',1,31072) LexToken(CLOSEBRACKET,')',1,31074) -LexToken(OPERATOR,'*',1,31075) +LexToken(MULTIPLICATION,'*',1,31075) LexToken(NUMBER,'26',1,31076) -LexToken(OPERATOR,'^',1,31078) +LexToken(MULTIPLICATION,'^',1,31078) LexToken(OPENBRACKET,'(',1,31079) LexToken(VAR,'i',1,31080) -LexToken(NUMBER,'-1',1,31081) +LexToken(ADDITION,'-',1,31081) +LexToken(NUMBER,'1',1,31082) LexToken(CLOSEBRACKET,')',1,31083) LexToken(SEMICOLON,';',1,31084) LexToken(EOL,'\n',1,31085) @@ -7417,7 +7440,7 @@ LexToken(EOL,'\n',1,32078) LexToken(VAR,'xinfo',1,32091) LexToken(OPENBRACKET,'(',1,32096) LexToken(DQSTRING,'" Scicos cannot read your Excel file, please verify"',1,32148) -LexToken(OPERATOR,'+',1,32149) +LexToken(ADDITION,'+',1,32149) LexToken(DQSTRING,'" the parameters "',1,32183) LexToken(CLOSEBRACKET,')',1,32184) LexToken(SEMICOLON,';',1,32185) @@ -7545,12 +7568,12 @@ LexToken(EOL,'\n',1,32569) LexToken(VAR,'xinfo',1,32582) LexToken(OPENBRACKET,'(',1,32587) LexToken(DQSTRING,'"x contains no data:x("',1,32610) -LexToken(OPERATOR,'+',1,32611) +LexToken(ADDITION,'+',1,32611) LexToken(VAR,'string',1,32612) LexToken(OPENBRACKET,'(',1,32618) LexToken(VAR,'i',1,32619) LexToken(CLOSEBRACKET,')',1,32620) -LexToken(OPERATOR,'+',1,32621) +LexToken(ADDITION,'+',1,32621) LexToken(DQSTRING,'")"',1,32624) LexToken(CLOSEBRACKET,')',1,32625) LexToken(SEMICOLON,';',1,32626) @@ -7577,12 +7600,12 @@ LexToken(EOL,'\n',1,32690) LexToken(VAR,'xinfo',1,32703) LexToken(OPENBRACKET,'(',1,32708) LexToken(DQSTRING,'"Y contains no data:y("',1,32731) -LexToken(OPERATOR,'+',1,32732) +LexToken(ADDITION,'+',1,32732) LexToken(VAR,'string',1,32733) LexToken(OPENBRACKET,'(',1,32739) LexToken(VAR,'i',1,32740) LexToken(CLOSEBRACKET,')',1,32741) -LexToken(OPERATOR,'+',1,32742) +LexToken(ADDITION,'+',1,32742) LexToken(DQSTRING,'")"',1,32745) LexToken(CLOSEBRACKET,')',1,32746) LexToken(SEMICOLON,';',1,32747) @@ -7638,7 +7661,7 @@ LexToken(EOL,'\n',1,32884) LexToken(VAR,'xe',1,32893) LexToken(OPENBRACKET,'(',1,32895) LexToken(LASTINDEX,'$',1,32896) -LexToken(OPERATOR,'+',1,32897) +LexToken(ADDITION,'+',1,32897) LexToken(NUMBER,'1',1,32898) LexToken(CLOSEBRACKET,')',1,32899) LexToken(ASSIGNMENT,'=',1,32900) @@ -7648,7 +7671,7 @@ LexToken(EOL,'\n',1,32903) LexToken(VAR,'ye',1,32912) LexToken(OPENBRACKET,'(',1,32914) LexToken(LASTINDEX,'$',1,32915) -LexToken(OPERATOR,'+',1,32916) +LexToken(ADDITION,'+',1,32916) LexToken(NUMBER,'1',1,32917) LexToken(CLOSEBRACKET,')',1,32918) LexToken(ASSIGNMENT,'=',1,32919) @@ -7933,13 +7956,13 @@ LexToken(OPENSQBRACKET,'[',1,34048) LexToken(DQSTRING,'"Filename"',1,34058) LexToken(SEMICOLON,';',1,34059) LexToken(DQSTRING,'"Reading [C] f"',1,34074) -LexToken(OPERATOR,'+',1,34075) +LexToken(ADDITION,'+',1,34075) LexToken(DQSTRING,'"ormat"',1,34094) LexToken(SEMICOLON,';',1,34095) LexToken(DQSTRING,'"Abscissa column"',1,34112) LexToken(SEMICOLON,';',1,34113) LexToken(DQSTRING,'"Output"',1,34121) -LexToken(OPERATOR,'+',1,34122) +LexToken(ADDITION,'+',1,34122) LexToken(DQSTRING,'" column"',1,34143) LexToken(CLOSESQBRACKET,']',1,34144) LexToken(COMMA,',',1,34145) @@ -8059,7 +8082,8 @@ LexToken(VAR,'Lx',1,34558) LexToken(ASSIGNMENT,'=',1,34560) LexToken(VAR,'mfscanf',1,34561) LexToken(OPENBRACKET,'(',1,34568) -LexToken(NUMBER,'-1',1,34569) +LexToken(ADDITION,'-',1,34569) +LexToken(NUMBER,'1',1,34570) LexToken(COMMA,',',1,34571) LexToken(VAR,'fd',1,34572) LexToken(COMMA,',',1,34574) @@ -8078,7 +8102,7 @@ LexToken(EOL,'\n',1,34622) LexToken(VAR,'xinfo',1,34635) LexToken(OPENBRACKET,'(',1,34640) LexToken(DQSTRING,'"Scicos cannot open the data file: "',1,34676) -LexToken(OPERATOR,'+',1,34678) +LexToken(ADDITION,'+',1,34678) LexToken(VAR,'filen',1,34680) LexToken(CLOSEBRACKET,')',1,34685) LexToken(SEMICOLON,';',1,34686) @@ -8263,7 +8287,7 @@ LexToken(OPENSQBRACKET,'[',1,35317) LexToken(DQSTRING,'"Filename"',1,35327) LexToken(SEMICOLON,';',1,35328) LexToken(DQSTRING,'"Writing [C] f"',1,35343) -LexToken(OPERATOR,'+',1,35344) +LexToken(ADDITION,'+',1,35344) LexToken(DQSTRING,'"ormat"',1,35363) LexToken(CLOSESQBRACKET,']',1,35364) LexToken(COMMA,',',1,35365) @@ -8348,7 +8372,7 @@ LexToken(EOL,'\n',1,35677) LexToken(VAR,'Cformat',1,35686) LexToken(ASSIGNMENT,'=',1,35693) LexToken(VAR,'Cformat',1,35694) -LexToken(OPERATOR,'+',1,35701) +LexToken(ADDITION,'+',1,35701) LexToken(DQSTRING,'"\\n"',1,35705) LexToken(SEMICOLON,';',1,35706) LexToken(EOL,'\n',1,35707) @@ -8388,7 +8412,7 @@ LexToken(EOL,'\n',1,35831) LexToken(VAR,'xinfo',1,35844) LexToken(OPENBRACKET,'(',1,35849) LexToken(DQSTRING,'"Scicos cannot open the data file:"',1,35884) -LexToken(OPERATOR,'+',1,35885) +LexToken(ADDITION,'+',1,35885) LexToken(VAR,'filen',1,35886) LexToken(CLOSEBRACKET,')',1,35891) LexToken(SEMICOLON,';',1,35892) @@ -8490,7 +8514,8 @@ LexToken(ASSIGNMENT,'=',1,36226) LexToken(NUMBER,'1',1,36227) LexToken(COLON,':',1,36228) LexToken(VAR,'N',1,36229) -LexToken(NUMBER,'-1',1,36230) +LexToken(ADDITION,'-',1,36230) +LexToken(NUMBER,'1',1,36231) LexToken(EOL,'\n',1,36232) LexToken(VAR,'X',1,36245) LexToken(ASSIGNMENT,'=',1,36246) @@ -8505,14 +8530,14 @@ LexToken(SEMICOLON,';',1,36254) LexToken(VAR,'x',1,36255) LexToken(OPENBRACKET,'(',1,36256) LexToken(VAR,'i',1,36257) -LexToken(OPERATOR,'+',1,36258) +LexToken(ADDITION,'+',1,36258) LexToken(NUMBER,'1',1,36259) LexToken(CLOSEBRACKET,')',1,36260) LexToken(SEMICOLON,';',1,36261) LexToken(VAR,'x',1,36262) LexToken(OPENBRACKET,'(',1,36263) LexToken(VAR,'i',1,36264) -LexToken(OPERATOR,'+',1,36265) +LexToken(ADDITION,'+',1,36265) LexToken(NUMBER,'1',1,36266) LexToken(CLOSEBRACKET,')',1,36267) LexToken(CLOSESQBRACKET,']',1,36268) @@ -8536,7 +8561,7 @@ LexToken(SEMICOLON,';',1,36297) LexToken(VAR,'y',1,36298) LexToken(OPENBRACKET,'(',1,36299) LexToken(VAR,'i',1,36300) -LexToken(OPERATOR,'+',1,36301) +LexToken(ADDITION,'+',1,36301) LexToken(NUMBER,'1',1,36302) LexToken(CLOSEBRACKET,')',1,36303) LexToken(CLOSESQBRACKET,']',1,36304) @@ -8683,7 +8708,8 @@ LexToken(ASSIGNMENT,'=',1,36923) LexToken(NUMBER,'1',1,36924) LexToken(COLON,':',1,36925) LexToken(VAR,'N',1,36926) -LexToken(NUMBER,'-1',1,36927) +LexToken(ADDITION,'-',1,36927) +LexToken(NUMBER,'1',1,36928) LexToken(EOL,'\n',1,36929) LexToken(VAR,'X',1,36938) LexToken(ASSIGNMENT,'=',1,36939) @@ -8700,12 +8726,12 @@ LexToken(COMMA,',',1,36956) LexToken(VAR,'x',1,36957) LexToken(OPENBRACKET,'(',1,36958) LexToken(VAR,'i',1,36959) -LexToken(OPERATOR,'+',1,36960) +LexToken(ADDITION,'+',1,36960) LexToken(NUMBER,'1',1,36961) LexToken(CLOSEBRACKET,')',1,36962) LexToken(COMMA,',',1,36963) LexToken(VAR,'NP',1,36964) -LexToken(OPERATOR,'+',1,36966) +LexToken(ADDITION,'+',1,36966) LexToken(NUMBER,'2',1,36967) LexToken(CLOSEBRACKET,')',1,36968) LexToken(TRANSPOSE,"'",1,36969) @@ -8746,7 +8772,8 @@ LexToken(OPENBRACKET,'(',1,37147) LexToken(NUMBER,'1',1,37148) LexToken(COLON,':',1,37149) LexToken(VAR,'N',1,37150) -LexToken(NUMBER,'-1',1,37151) +LexToken(ADDITION,'-',1,37151) +LexToken(NUMBER,'1',1,37152) LexToken(CLOSEBRACKET,')',1,37153) LexToken(SEMICOLON,';',1,37154) LexToken(EOL,'\n',1,37155) @@ -8757,9 +8784,10 @@ LexToken(OPENBRACKET,'(',1,37167) LexToken(VAR,'N',1,37168) LexToken(COLON,':',1,37169) LexToken(NUMBER,'2',1,37170) -LexToken(OPERATOR,'*',1,37171) +LexToken(MULTIPLICATION,'*',1,37171) LexToken(VAR,'N',1,37172) -LexToken(NUMBER,'-2',1,37173) +LexToken(ADDITION,'-',1,37173) +LexToken(NUMBER,'2',1,37174) LexToken(CLOSEBRACKET,')',1,37175) LexToken(SEMICOLON,';',1,37176) LexToken(EOL,'\n',1,37177) @@ -8768,14 +8796,16 @@ LexToken(ASSIGNMENT,'=',1,37187) LexToken(VAR,'Z',1,37188) LexToken(OPENBRACKET,'(',1,37189) LexToken(NUMBER,'2',1,37190) -LexToken(OPERATOR,'*',1,37191) +LexToken(MULTIPLICATION,'*',1,37191) LexToken(VAR,'N',1,37192) -LexToken(NUMBER,'-1',1,37193) +LexToken(ADDITION,'-',1,37193) +LexToken(NUMBER,'1',1,37194) LexToken(COLON,':',1,37195) LexToken(NUMBER,'3',1,37196) -LexToken(OPERATOR,'*',1,37197) +LexToken(MULTIPLICATION,'*',1,37197) LexToken(VAR,'N',1,37198) -LexToken(NUMBER,'-3',1,37199) +LexToken(ADDITION,'-',1,37199) +LexToken(NUMBER,'3',1,37200) LexToken(CLOSEBRACKET,')',1,37201) LexToken(SEMICOLON,';',1,37202) LexToken(EOL,'\n',1,37203) @@ -8796,9 +8826,11 @@ LexToken(FOR,'for',1,37245) LexToken(VAR,'i',1,37249) LexToken(ASSIGNMENT,'=',1,37250) LexToken(VAR,'N',1,37251) -LexToken(NUMBER,'-1',1,37252) +LexToken(ADDITION,'-',1,37252) +LexToken(NUMBER,'1',1,37253) LexToken(COLON,':',1,37254) -LexToken(NUMBER,'-1',1,37255) +LexToken(ADDITION,'-',1,37255) +LexToken(NUMBER,'1',1,37256) LexToken(COLON,':',1,37257) LexToken(NUMBER,'1',1,37258) LexToken(EOL,'\n',1,37259) @@ -8831,38 +8863,38 @@ LexToken(VAR,'A',1,37376) LexToken(OPENBRACKET,'(',1,37377) LexToken(VAR,'i',1,37378) LexToken(CLOSEBRACKET,')',1,37379) -LexToken(OPERATOR,'*',1,37380) +LexToken(MULTIPLICATION,'*',1,37380) LexToken(OPENBRACKET,'(',1,37381) LexToken(VAR,'X',1,37382) LexToken(OPENBRACKET,'(',1,37383) LexToken(VAR,'j',1,37384) LexToken(CLOSEBRACKET,')',1,37385) -LexToken(OPERATOR,'-',1,37386) +LexToken(ADDITION,'-',1,37386) LexToken(VAR,'x',1,37387) LexToken(OPENBRACKET,'(',1,37388) LexToken(VAR,'i',1,37389) LexToken(CLOSEBRACKET,')',1,37390) LexToken(CLOSEBRACKET,')',1,37391) -LexToken(OPERATOR,'^',1,37392) +LexToken(MULTIPLICATION,'^',1,37392) LexToken(NUMBER,'2',1,37393) -LexToken(OPERATOR,'+',1,37394) +LexToken(ADDITION,'+',1,37394) LexToken(VAR,'B',1,37395) LexToken(OPENBRACKET,'(',1,37396) LexToken(VAR,'i',1,37397) LexToken(CLOSEBRACKET,')',1,37398) -LexToken(OPERATOR,'*',1,37399) +LexToken(MULTIPLICATION,'*',1,37399) LexToken(OPENBRACKET,'(',1,37400) LexToken(VAR,'X',1,37401) LexToken(OPENBRACKET,'(',1,37402) LexToken(VAR,'j',1,37403) LexToken(CLOSEBRACKET,')',1,37404) -LexToken(OPERATOR,'-',1,37405) +LexToken(ADDITION,'-',1,37405) LexToken(VAR,'x',1,37406) LexToken(OPENBRACKET,'(',1,37407) LexToken(VAR,'i',1,37408) LexToken(CLOSEBRACKET,')',1,37409) LexToken(CLOSEBRACKET,')',1,37410) -LexToken(OPERATOR,'+',1,37411) +LexToken(ADDITION,'+',1,37411) LexToken(VAR,'C',1,37412) LexToken(OPENBRACKET,'(',1,37413) LexToken(VAR,'i',1,37414) @@ -8877,7 +8909,8 @@ LexToken(VAR,'matrix',1,37444) LexToken(OPENBRACKET,'(',1,37450) LexToken(VAR,'Z',1,37451) LexToken(COMMA,',',1,37452) -LexToken(NUMBER,'-1',1,37453) +LexToken(ADDITION,'-',1,37453) +LexToken(NUMBER,'1',1,37454) LexToken(COMMA,',',1,37455) LexToken(NUMBER,'1',1,37456) LexToken(CLOSEBRACKET,')',1,37457) @@ -8934,7 +8967,7 @@ LexToken(EOL,'\n',1,37671) LexToken(VAR,'xinfo',1,37684) LexToken(OPENBRACKET,'(',1,37689) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,37708) -LexToken(OPERATOR,'+',1,37709) +LexToken(ADDITION,'+',1,37709) LexToken(VAR,'METHOD',1,37710) LexToken(CLOSEBRACKET,')',1,37716) LexToken(EOL,'\n',1,37717) @@ -9017,7 +9050,7 @@ LexToken(EOL,'\n',1,38001) LexToken(VAR,'xinfo',1,38014) LexToken(OPENBRACKET,'(',1,38019) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38038) -LexToken(OPERATOR,'+',1,38039) +LexToken(ADDITION,'+',1,38039) LexToken(VAR,'METHOD',1,38040) LexToken(CLOSEBRACKET,')',1,38046) LexToken(EOL,'\n',1,38047) @@ -9075,7 +9108,7 @@ LexToken(EOL,'\n',1,38271) LexToken(VAR,'xinfo',1,38284) LexToken(OPENBRACKET,'(',1,38289) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38308) -LexToken(OPERATOR,'+',1,38309) +LexToken(ADDITION,'+',1,38309) LexToken(VAR,'METHOD',1,38310) LexToken(CLOSEBRACKET,')',1,38316) LexToken(EOL,'\n',1,38317) @@ -9134,7 +9167,7 @@ LexToken(EOL,'\n',1,38537) LexToken(VAR,'xinfo',1,38550) LexToken(OPENBRACKET,'(',1,38555) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38575) -LexToken(OPERATOR,'+',1,38576) +LexToken(ADDITION,'+',1,38576) LexToken(VAR,'METHOD',1,38577) LexToken(CLOSEBRACKET,')',1,38583) LexToken(EOL,'\n',1,38584) @@ -9198,7 +9231,7 @@ LexToken(EOL,'\n',1,38812) LexToken(VAR,'xinfo',1,38825) LexToken(OPENBRACKET,'(',1,38830) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,38849) -LexToken(OPERATOR,'+',1,38850) +LexToken(ADDITION,'+',1,38850) LexToken(VAR,'METHOD',1,38851) LexToken(CLOSEBRACKET,')',1,38857) LexToken(EOL,'\n',1,38858) @@ -9230,7 +9263,8 @@ LexToken(VAR,'x',1,38980) LexToken(COMMA,',',1,38981) LexToken(DQSTRING,'"*"',1,38984) LexToken(CLOSEBRACKET,')',1,38985) -LexToken(NUMBER,'-1',1,38986) +LexToken(ADDITION,'-',1,38986) +LexToken(NUMBER,'1',1,38987) LexToken(SEMICOLON,';',1,38988) LexToken(EOL,'\n',1,38989) LexToken(VAR,'A',1,38994) @@ -9238,12 +9272,13 @@ LexToken(ASSIGNMENT,'=',1,38995) LexToken(VAR,'zeros',1,38996) LexToken(OPENBRACKET,'(',1,39001) LexToken(NUMBER,'3',1,39002) -LexToken(OPERATOR,'*',1,39003) +LexToken(MULTIPLICATION,'*',1,39003) LexToken(VAR,'N',1,39004) -LexToken(NUMBER,'-1',1,39005) +LexToken(ADDITION,'-',1,39005) +LexToken(NUMBER,'1',1,39006) LexToken(COMMA,',',1,39007) LexToken(VAR,'N',1,39008) -LexToken(OPERATOR,'*',1,39009) +LexToken(MULTIPLICATION,'*',1,39009) LexToken(NUMBER,'3',1,39010) LexToken(CLOSEBRACKET,')',1,39011) LexToken(SEMICOLON,';',1,39012) @@ -9253,9 +9288,10 @@ LexToken(ASSIGNMENT,'=',1,39019) LexToken(VAR,'zeros',1,39020) LexToken(OPENBRACKET,'(',1,39025) LexToken(NUMBER,'3',1,39026) -LexToken(OPERATOR,'*',1,39027) +LexToken(MULTIPLICATION,'*',1,39027) LexToken(VAR,'N',1,39028) -LexToken(NUMBER,'-1',1,39029) +LexToken(ADDITION,'-',1,39029) +LexToken(NUMBER,'1',1,39030) LexToken(COMMA,',',1,39031) LexToken(NUMBER,'1',1,39032) LexToken(CLOSEBRACKET,')',1,39033) @@ -9271,12 +9307,13 @@ LexToken(EOL,'\n',1,39049) LexToken(VAR,'j',1,39058) LexToken(ASSIGNMENT,'=',1,39059) LexToken(NUMBER,'3',1,39060) -LexToken(OPERATOR,'*',1,39061) +LexToken(MULTIPLICATION,'*',1,39061) LexToken(OPENBRACKET,'(',1,39062) LexToken(VAR,'i',1,39063) -LexToken(NUMBER,'-1',1,39064) +LexToken(ADDITION,'-',1,39064) +LexToken(NUMBER,'1',1,39065) LexToken(CLOSEBRACKET,')',1,39066) -LexToken(OPERATOR,'+',1,39067) +LexToken(ADDITION,'+',1,39067) LexToken(NUMBER,'1',1,39068) LexToken(SEMICOLON,';',1,39069) LexToken(EOL,'\n',1,39070) @@ -9285,9 +9322,9 @@ LexToken(OPENBRACKET,'(',1,39080) LexToken(VAR,'j',1,39081) LexToken(COMMA,',',1,39082) LexToken(VAR,'i',1,39083) -LexToken(OPERATOR,'+',1,39084) +LexToken(ADDITION,'+',1,39084) LexToken(NUMBER,'2',1,39085) -LexToken(OPERATOR,'*',1,39086) +LexToken(MULTIPLICATION,'*',1,39086) LexToken(VAR,'N',1,39087) LexToken(CLOSEBRACKET,')',1,39088) LexToken(ASSIGNMENT,'=',1,39089) @@ -9308,7 +9345,7 @@ LexToken(EOL,'\n',1,39111) LexToken(VAR,'A',1,39120) LexToken(OPENBRACKET,'(',1,39121) LexToken(VAR,'j',1,39122) -LexToken(OPERATOR,'+',1,39123) +LexToken(ADDITION,'+',1,39123) LexToken(NUMBER,'1',1,39124) LexToken(COMMA,',',1,39125) LexToken(VAR,'i',1,39126) @@ -9318,37 +9355,37 @@ LexToken(OPENBRACKET,'(',1,39129) LexToken(VAR,'x',1,39130) LexToken(OPENBRACKET,'(',1,39131) LexToken(VAR,'i',1,39132) -LexToken(OPERATOR,'+',1,39133) +LexToken(ADDITION,'+',1,39133) LexToken(NUMBER,'1',1,39134) LexToken(CLOSEBRACKET,')',1,39135) -LexToken(OPERATOR,'-',1,39136) +LexToken(ADDITION,'-',1,39136) LexToken(VAR,'x',1,39137) LexToken(OPENBRACKET,'(',1,39138) LexToken(VAR,'i',1,39139) LexToken(CLOSEBRACKET,')',1,39140) LexToken(CLOSEBRACKET,')',1,39141) -LexToken(OPERATOR,'^',1,39142) +LexToken(MULTIPLICATION,'^',1,39142) LexToken(NUMBER,'2',1,39143) LexToken(SEMICOLON,';',1,39144) LexToken(EOL,'\n',1,39145) LexToken(VAR,'A',1,39154) LexToken(OPENBRACKET,'(',1,39155) LexToken(VAR,'j',1,39156) -LexToken(OPERATOR,'+',1,39157) +LexToken(ADDITION,'+',1,39157) LexToken(NUMBER,'1',1,39158) LexToken(COMMA,',',1,39159) LexToken(VAR,'i',1,39160) -LexToken(OPERATOR,'+',1,39161) +LexToken(ADDITION,'+',1,39161) LexToken(VAR,'N',1,39162) LexToken(CLOSEBRACKET,')',1,39163) LexToken(ASSIGNMENT,'=',1,39164) LexToken(VAR,'x',1,39165) LexToken(OPENBRACKET,'(',1,39166) LexToken(VAR,'i',1,39167) -LexToken(OPERATOR,'+',1,39168) +LexToken(ADDITION,'+',1,39168) LexToken(NUMBER,'1',1,39169) LexToken(CLOSEBRACKET,')',1,39170) -LexToken(OPERATOR,'-',1,39171) +LexToken(ADDITION,'-',1,39171) LexToken(VAR,'x',1,39172) LexToken(OPENBRACKET,'(',1,39173) LexToken(VAR,'i',1,39174) @@ -9358,13 +9395,13 @@ LexToken(EOL,'\n',1,39177) LexToken(VAR,'A',1,39186) LexToken(OPENBRACKET,'(',1,39187) LexToken(VAR,'j',1,39188) -LexToken(OPERATOR,'+',1,39189) +LexToken(ADDITION,'+',1,39189) LexToken(NUMBER,'1',1,39190) LexToken(COMMA,',',1,39191) LexToken(VAR,'i',1,39192) -LexToken(OPERATOR,'+',1,39193) +LexToken(ADDITION,'+',1,39193) LexToken(NUMBER,'2',1,39194) -LexToken(OPERATOR,'*',1,39195) +LexToken(MULTIPLICATION,'*',1,39195) LexToken(VAR,'N',1,39196) LexToken(CLOSEBRACKET,')',1,39197) LexToken(ASSIGNMENT,'=',1,39198) @@ -9374,14 +9411,14 @@ LexToken(EOL,'\n',1,39201) LexToken(VAR,'B',1,39210) LexToken(OPENBRACKET,'(',1,39211) LexToken(VAR,'j',1,39212) -LexToken(OPERATOR,'+',1,39213) +LexToken(ADDITION,'+',1,39213) LexToken(NUMBER,'1',1,39214) LexToken(CLOSEBRACKET,')',1,39215) LexToken(ASSIGNMENT,'=',1,39216) LexToken(VAR,'y',1,39217) LexToken(OPENBRACKET,'(',1,39218) LexToken(VAR,'i',1,39219) -LexToken(OPERATOR,'+',1,39220) +LexToken(ADDITION,'+',1,39220) LexToken(NUMBER,'1',1,39221) LexToken(CLOSEBRACKET,')',1,39222) LexToken(SEMICOLON,';',1,39223) @@ -9395,39 +9432,41 @@ LexToken(ASSIGNMENT,'=',1,39243) LexToken(NUMBER,'1',1,39244) LexToken(COLON,':',1,39245) LexToken(VAR,'N',1,39246) -LexToken(NUMBER,'-1',1,39247) +LexToken(ADDITION,'-',1,39247) +LexToken(NUMBER,'1',1,39248) LexToken(EOL,'\n',1,39249) LexToken(VAR,'j',1,39258) LexToken(ASSIGNMENT,'=',1,39259) LexToken(NUMBER,'3',1,39260) -LexToken(OPERATOR,'*',1,39261) +LexToken(MULTIPLICATION,'*',1,39261) LexToken(OPENBRACKET,'(',1,39262) LexToken(VAR,'i',1,39263) -LexToken(NUMBER,'-1',1,39264) +LexToken(ADDITION,'-',1,39264) +LexToken(NUMBER,'1',1,39265) LexToken(CLOSEBRACKET,')',1,39266) -LexToken(OPERATOR,'+',1,39267) +LexToken(ADDITION,'+',1,39267) LexToken(NUMBER,'1',1,39268) LexToken(SEMICOLON,';',1,39269) LexToken(EOL,'\n',1,39270) LexToken(VAR,'A',1,39279) LexToken(OPENBRACKET,'(',1,39280) LexToken(VAR,'j',1,39281) -LexToken(OPERATOR,'+',1,39282) +LexToken(ADDITION,'+',1,39282) LexToken(NUMBER,'2',1,39283) LexToken(COMMA,',',1,39284) LexToken(VAR,'i',1,39285) LexToken(CLOSEBRACKET,')',1,39286) LexToken(ASSIGNMENT,'=',1,39287) LexToken(NUMBER,'2',1,39288) -LexToken(OPERATOR,'*',1,39289) +LexToken(MULTIPLICATION,'*',1,39289) LexToken(OPENBRACKET,'(',1,39290) LexToken(VAR,'x',1,39291) LexToken(OPENBRACKET,'(',1,39292) LexToken(VAR,'i',1,39293) -LexToken(OPERATOR,'+',1,39294) +LexToken(ADDITION,'+',1,39294) LexToken(NUMBER,'1',1,39295) LexToken(CLOSEBRACKET,')',1,39296) -LexToken(OPERATOR,'-',1,39297) +LexToken(ADDITION,'-',1,39297) LexToken(VAR,'x',1,39298) LexToken(OPENBRACKET,'(',1,39299) LexToken(VAR,'i',1,39300) @@ -9438,11 +9477,11 @@ LexToken(EOL,'\n',1,39304) LexToken(VAR,'A',1,39313) LexToken(OPENBRACKET,'(',1,39314) LexToken(VAR,'j',1,39315) -LexToken(OPERATOR,'+',1,39316) +LexToken(ADDITION,'+',1,39316) LexToken(NUMBER,'2',1,39317) LexToken(COMMA,',',1,39318) LexToken(VAR,'i',1,39319) -LexToken(OPERATOR,'+',1,39320) +LexToken(ADDITION,'+',1,39320) LexToken(VAR,'N',1,39321) LexToken(CLOSEBRACKET,')',1,39322) LexToken(ASSIGNMENT,'=',1,39323) @@ -9452,17 +9491,18 @@ LexToken(EOL,'\n',1,39326) LexToken(VAR,'A',1,39335) LexToken(OPENBRACKET,'(',1,39336) LexToken(VAR,'j',1,39337) -LexToken(OPERATOR,'+',1,39338) +LexToken(ADDITION,'+',1,39338) LexToken(NUMBER,'2',1,39339) LexToken(COMMA,',',1,39340) LexToken(VAR,'i',1,39341) -LexToken(OPERATOR,'+',1,39342) +LexToken(ADDITION,'+',1,39342) LexToken(VAR,'N',1,39343) -LexToken(OPERATOR,'+',1,39344) +LexToken(ADDITION,'+',1,39344) LexToken(NUMBER,'1',1,39345) LexToken(CLOSEBRACKET,')',1,39346) LexToken(ASSIGNMENT,'=',1,39347) -LexToken(NUMBER,'-1',1,39348) +LexToken(ADDITION,'-',1,39348) +LexToken(NUMBER,'1',1,39349) LexToken(SEMICOLON,';',1,39350) LexToken(EOL,'\n',1,39351) LexToken(END,'end',1,39356) @@ -9473,11 +9513,11 @@ LexToken(ASSIGNMENT,'=',1,39366) LexToken(VAR,'zeros',1,39367) LexToken(OPENBRACKET,'(',1,39372) LexToken(NUMBER,'3',1,39373) -LexToken(OPERATOR,'*',1,39374) +LexToken(MULTIPLICATION,'*',1,39374) LexToken(VAR,'N',1,39375) LexToken(COMMA,',',1,39376) LexToken(NUMBER,'3',1,39377) -LexToken(OPERATOR,'*',1,39378) +LexToken(MULTIPLICATION,'*',1,39378) LexToken(VAR,'N',1,39379) LexToken(CLOSEBRACKET,')',1,39380) LexToken(SEMICOLON,';',1,39381) @@ -9497,21 +9537,21 @@ LexToken(VAR,'i',1,39409) LexToken(CLOSEBRACKET,')',1,39410) LexToken(ASSIGNMENT,'=',1,39411) LexToken(NUMBER,'4',1,39412) -LexToken(OPERATOR,'*',1,39413) +LexToken(MULTIPLICATION,'*',1,39413) LexToken(OPENBRACKET,'(',1,39414) LexToken(VAR,'x',1,39415) LexToken(OPENBRACKET,'(',1,39416) LexToken(VAR,'i',1,39417) -LexToken(OPERATOR,'+',1,39418) +LexToken(ADDITION,'+',1,39418) LexToken(NUMBER,'1',1,39419) LexToken(CLOSEBRACKET,')',1,39420) -LexToken(OPERATOR,'-',1,39421) +LexToken(ADDITION,'-',1,39421) LexToken(VAR,'x',1,39422) LexToken(OPENBRACKET,'(',1,39423) LexToken(VAR,'i',1,39424) LexToken(CLOSEBRACKET,')',1,39425) LexToken(CLOSEBRACKET,')',1,39426) -LexToken(OPERATOR,'^',1,39427) +LexToken(MULTIPLICATION,'^',1,39427) LexToken(NUMBER,'2',1,39428) LexToken(EOL,'\n',1,39429) LexToken(VAR,'Q',1,39438) @@ -9519,20 +9559,20 @@ LexToken(OPENBRACKET,'(',1,39439) LexToken(VAR,'i',1,39440) LexToken(COMMA,',',1,39441) LexToken(VAR,'i',1,39442) -LexToken(OPERATOR,'+',1,39443) +LexToken(ADDITION,'+',1,39443) LexToken(VAR,'N',1,39444) LexToken(CLOSEBRACKET,')',1,39445) LexToken(ASSIGNMENT,'=',1,39446) LexToken(NUMBER,'2',1,39447) -LexToken(OPERATOR,'*',1,39448) +LexToken(MULTIPLICATION,'*',1,39448) LexToken(OPENBRACKET,'(',1,39449) LexToken(VAR,'x',1,39450) LexToken(OPENBRACKET,'(',1,39451) LexToken(VAR,'i',1,39452) -LexToken(OPERATOR,'+',1,39453) +LexToken(ADDITION,'+',1,39453) LexToken(NUMBER,'1',1,39454) LexToken(CLOSEBRACKET,')',1,39455) -LexToken(OPERATOR,'-',1,39456) +LexToken(ADDITION,'-',1,39456) LexToken(VAR,'x',1,39457) LexToken(OPENBRACKET,'(',1,39458) LexToken(VAR,'i',1,39459) @@ -9542,22 +9582,22 @@ LexToken(EOL,'\n',1,39462) LexToken(VAR,'Q',1,39471) LexToken(OPENBRACKET,'(',1,39472) LexToken(VAR,'i',1,39473) -LexToken(OPERATOR,'+',1,39474) +LexToken(ADDITION,'+',1,39474) LexToken(VAR,'N',1,39475) LexToken(COMMA,',',1,39476) LexToken(VAR,'i',1,39477) LexToken(CLOSEBRACKET,')',1,39478) LexToken(ASSIGNMENT,'=',1,39479) LexToken(NUMBER,'2',1,39480) -LexToken(OPERATOR,'*',1,39481) +LexToken(MULTIPLICATION,'*',1,39481) LexToken(OPENBRACKET,'(',1,39482) LexToken(VAR,'x',1,39483) LexToken(OPENBRACKET,'(',1,39484) LexToken(VAR,'i',1,39485) -LexToken(OPERATOR,'+',1,39486) +LexToken(ADDITION,'+',1,39486) LexToken(NUMBER,'1',1,39487) LexToken(CLOSEBRACKET,')',1,39488) -LexToken(OPERATOR,'-',1,39489) +LexToken(ADDITION,'-',1,39489) LexToken(VAR,'x',1,39490) LexToken(OPENBRACKET,'(',1,39491) LexToken(VAR,'i',1,39492) @@ -9567,11 +9607,11 @@ LexToken(EOL,'\n',1,39495) LexToken(VAR,'Q',1,39504) LexToken(OPENBRACKET,'(',1,39505) LexToken(VAR,'i',1,39506) -LexToken(OPERATOR,'+',1,39507) +LexToken(ADDITION,'+',1,39507) LexToken(VAR,'N',1,39508) LexToken(COMMA,',',1,39509) LexToken(VAR,'i',1,39510) -LexToken(OPERATOR,'+',1,39511) +LexToken(ADDITION,'+',1,39511) LexToken(VAR,'N',1,39512) LexToken(CLOSEBRACKET,')',1,39513) LexToken(ASSIGNMENT,'=',1,39514) @@ -9594,14 +9634,16 @@ LexToken(COMMA,',',1,39541) LexToken(VAR,'zeros',1,39542) LexToken(OPENBRACKET,'(',1,39547) LexToken(NUMBER,'3',1,39548) -LexToken(OPERATOR,'*',1,39549) +LexToken(MULTIPLICATION,'*',1,39549) LexToken(VAR,'N',1,39550) -LexToken(NUMBER,'-1',1,39551) +LexToken(ADDITION,'-',1,39551) +LexToken(NUMBER,'1',1,39552) LexToken(COMMA,',',1,39553) LexToken(NUMBER,'3',1,39554) -LexToken(OPERATOR,'*',1,39555) +LexToken(MULTIPLICATION,'*',1,39555) LexToken(VAR,'N',1,39556) -LexToken(NUMBER,'-1',1,39557) +LexToken(ADDITION,'-',1,39557) +LexToken(NUMBER,'1',1,39558) LexToken(CLOSEBRACKET,')',1,39559) LexToken(CLOSESQBRACKET,']',1,39560) LexToken(EOL,'\n',1,39561) @@ -9611,7 +9653,7 @@ LexToken(OPENSQBRACKET,'[',1,39569) LexToken(VAR,'zeros',1,39570) LexToken(OPENBRACKET,'(',1,39575) LexToken(NUMBER,'3',1,39576) -LexToken(OPERATOR,'*',1,39577) +LexToken(MULTIPLICATION,'*',1,39577) LexToken(VAR,'N',1,39578) LexToken(COMMA,',',1,39579) LexToken(NUMBER,'1',1,39580) @@ -9623,7 +9665,7 @@ LexToken(EOL,'\n',1,39585) LexToken(VAR,'Zt',1,39590) LexToken(ASSIGNMENT,'=',1,39592) LexToken(VAR,'At',1,39593) -LexToken(OPERATOR,'\\',1,39595) +LexToken(MULTIPLICATION,'\\',1,39595) LexToken(VAR,'Bt',1,39596) LexToken(SEMICOLON,';',1,39598) LexToken(EOL,'\n',1,39599) @@ -9634,7 +9676,7 @@ LexToken(OPENBRACKET,'(',1,39608) LexToken(NUMBER,'1',1,39609) LexToken(COLON,':',1,39610) LexToken(NUMBER,'3',1,39611) -LexToken(OPERATOR,'*',1,39612) +LexToken(MULTIPLICATION,'*',1,39612) LexToken(VAR,'N',1,39613) LexToken(COMMA,',',1,39614) LexToken(NUMBER,'1',1,39615) diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 4e7a849e..ed23d172 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -120,11 +120,11 @@ LexToken(ASSIGNMENT,'=',1,1141) LexToken(VAR,'rpar',1,1143) LexToken(OPENBRACKET,'(',1,1147) LexToken(VAR,'n',1,1148) -LexToken(OPERATOR,'+',1,1149) +LexToken(ADDITION,'+',1,1149) LexToken(NUMBER,'1',1,1150) LexToken(COLON,':',1,1151) LexToken(NUMBER,'2',1,1152) -LexToken(OPERATOR,'*',1,1153) +LexToken(MULTIPLICATION,'*',1,1153) LexToken(VAR,'n',1,1154) LexToken(CLOSEBRACKET,')',1,1155) LexToken(SEMICOLON,';',1,1156) @@ -136,15 +136,15 @@ LexToken(OPENBRACKET,'(',1,1175) LexToken(VAR,'rpar',1,1176) LexToken(OPENBRACKET,'(',1,1180) LexToken(NUMBER,'2',1,1181) -LexToken(OPERATOR,'*',1,1182) +LexToken(MULTIPLICATION,'*',1,1182) LexToken(VAR,'n',1,1183) -LexToken(OPERATOR,'+',1,1184) +LexToken(ADDITION,'+',1,1184) LexToken(NUMBER,'1',1,1185) LexToken(COLON,':',1,1186) LexToken(NUMBER,'2',1,1187) -LexToken(OPERATOR,'*',1,1188) +LexToken(MULTIPLICATION,'*',1,1188) LexToken(VAR,'n',1,1189) -LexToken(OPERATOR,'+',1,1190) +LexToken(ADDITION,'+',1,1190) LexToken(NUMBER,'4',1,1191) LexToken(CLOSEBRACKET,')',1,1192) LexToken(COMMA,',',1,1193) @@ -251,13 +251,14 @@ LexToken(NUMBER,'2',1,1619) LexToken(COLON,':',1,1620) LexToken(VAR,'n',1,1621) LexToken(CLOSEBRACKET,')',1,1622) -LexToken(OPERATOR,'-',1,1623) +LexToken(ADDITION,'-',1,1623) LexToken(VAR,'xx',1,1624) LexToken(OPENBRACKET,'(',1,1626) LexToken(NUMBER,'1',1,1627) LexToken(COLON,':',1,1628) LexToken(VAR,'n',1,1629) -LexToken(NUMBER,'-1',1,1630) +LexToken(ADDITION,'-',1,1630) +LexToken(NUMBER,'1',1,1631) LexToken(CLOSEBRACKET,')',1,1632) LexToken(COMPARISON,'<',1,1633) LexToken(NUMBER,'0',1,1634) @@ -386,7 +387,8 @@ LexToken(EOL,'\n',1,2187) LexToken(VAR,'yy',1,2196) LexToken(ASSIGNMENT,'=',1,2199) LexToken(OPENSQBRACKET,'[',1,2201) -LexToken(NUMBER,'-5',1,2202) +LexToken(ADDITION,'-',1,2202) +LexToken(NUMBER,'5',1,2203) LexToken(SEMICOLON,';',1,2204) LexToken(NUMBER,'5',1,2205) LexToken(SEMICOLON,';',1,2206) @@ -398,7 +400,8 @@ LexToken(ASSIGNMENT,'=',1,2223) LexToken(OPENSQBRACKET,'[',1,2225) LexToken(NUMBER,'0',1,2226) LexToken(COMMA,',',1,2227) -LexToken(NUMBER,'-5',1,2228) +LexToken(ADDITION,'-',1,2228) +LexToken(NUMBER,'5',1,2229) LexToken(COMMA,',',1,2230) LexToken(NUMBER,'2',1,2231) LexToken(COMMA,',',1,2232) diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index c881e400..f2f94229 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -167,7 +167,7 @@ LexToken(EOL,'\n',1,1371) LexToken(VAR,'spath',1,1388) LexToken(OPENBRACKET,'(',1,1393) LexToken(LASTINDEX,'$',1,1394) -LexToken(OPERATOR,'+',1,1395) +LexToken(ADDITION,'+',1,1395) LexToken(NUMBER,'1',1,1396) LexToken(CLOSEBRACKET,')',1,1397) LexToken(ASSIGNMENT,'=',1,1398) @@ -176,7 +176,7 @@ LexToken(EOL,'\n',1,1406) LexToken(VAR,'spath',1,1423) LexToken(OPENBRACKET,'(',1,1428) LexToken(LASTINDEX,'$',1,1429) -LexToken(OPERATOR,'+',1,1430) +LexToken(ADDITION,'+',1,1430) LexToken(NUMBER,'1',1,1431) LexToken(CLOSEBRACKET,')',1,1432) LexToken(ASSIGNMENT,'=',1,1433) @@ -185,7 +185,7 @@ LexToken(EOL,'\n',1,1440) LexToken(VAR,'spath',1,1457) LexToken(OPENBRACKET,'(',1,1462) LexToken(LASTINDEX,'$',1,1463) -LexToken(OPERATOR,'+',1,1464) +LexToken(ADDITION,'+',1,1464) LexToken(NUMBER,'1',1,1465) LexToken(CLOSEBRACKET,')',1,1466) LexToken(ASSIGNMENT,'=',1,1467) @@ -194,7 +194,7 @@ LexToken(EOL,'\n',1,1474) LexToken(VAR,'spath',1,1491) LexToken(OPENBRACKET,'(',1,1496) LexToken(LASTINDEX,'$',1,1497) -LexToken(OPERATOR,'+',1,1498) +LexToken(ADDITION,'+',1,1498) LexToken(NUMBER,'1',1,1499) LexToken(CLOSEBRACKET,')',1,1500) LexToken(ASSIGNMENT,'=',1,1501) @@ -215,11 +215,11 @@ LexToken(EOL,'\n',1,1568) LexToken(VAR,'execstr',1,1581) LexToken(OPENBRACKET,'(',1,1588) LexToken(DQSTRING,'"xxn="',1,1594) -LexToken(OPERATOR,'+',1,1595) +LexToken(ADDITION,'+',1,1595) LexToken(VAR,'xx',1,1596) LexToken(DOT,'.',1,1598) LexToken(VAR,'gui',1,1599) -LexToken(OPERATOR,'+',1,1602) +LexToken(ADDITION,'+',1,1602) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1616) LexToken(CLOSEBRACKET,')',1,1617) LexToken(EOL,'\n',1,1618) @@ -713,7 +713,7 @@ LexToken(VAR,'size',1,4204) LexToken(OPENBRACKET,'(',1,4208) LexToken(VAR,'newpar',1,4209) LexToken(CLOSEBRACKET,')',1,4215) -LexToken(OPERATOR,'+',1,4216) +LexToken(ADDITION,'+',1,4216) LexToken(NUMBER,'1',1,4217) LexToken(CLOSEBRACKET,')',1,4218) LexToken(ASSIGNMENT,'=',1,4219) @@ -759,11 +759,13 @@ LexToken(OPENBRACKET,'(',1,4461) LexToken(VAR,'wpar',1,4473) LexToken(ASSIGNMENT,'=',1,4477) LexToken(OPENSQBRACKET,'[',1,4478) -LexToken(NUMBER,'-159.096',1,4479) +LexToken(ADDITION,'-',1,4479) +LexToken(NUMBER,'159.096',1,4480) LexToken(COMMA,',',1,4487) LexToken(NUMBER,'811.104',1,4488) LexToken(COMMA,',',1,4495) -LexToken(NUMBER,'-121.216',1,4496) +LexToken(ADDITION,'-',1,4496) +LexToken(NUMBER,'121.216',1,4497) LexToken(COMMA,',',1,4504) LexToken(NUMBER,'617.984',1,4505) LexToken(COMMA,',',1,4512) @@ -799,7 +801,8 @@ LexToken(NUMBER,'0.000001',1,4603) LexToken(COMMA,',',1,4611) LexToken(NUMBER,'1.000',1,4612) LexToken(VAR,'D',1,4617) -LexToken(NUMBER,'-10',1,4618) +LexToken(ADDITION,'-',1,4618) +LexToken(NUMBER,'10',1,4619) LexToken(COMMA,',',1,4621) LexToken(NUMBER,'100001',1,4622) LexToken(COMMA,',',1,4628) @@ -1018,15 +1021,18 @@ LexToken(NUMBER,'1',1,5413) LexToken(COMMA,',',1,5414) LexToken(VAR,'out',1,5426) LexToken(ASSIGNMENT,'=',1,5429) -LexToken(NUMBER,'-1',1,5430) +LexToken(ADDITION,'-',1,5430) +LexToken(NUMBER,'1',1,5431) LexToken(COMMA,',',1,5432) LexToken(VAR,'out2',1,5444) LexToken(ASSIGNMENT,'=',1,5448) -LexToken(NUMBER,'-2',1,5449) +LexToken(ADDITION,'-',1,5449) +LexToken(NUMBER,'2',1,5450) LexToken(COMMA,',',1,5451) LexToken(VAR,'outtyp',1,5463) LexToken(ASSIGNMENT,'=',1,5469) -LexToken(NUMBER,'-1',1,5470) +LexToken(ADDITION,'-',1,5470) +LexToken(NUMBER,'1',1,5471) LexToken(COMMA,',',1,5472) LexToken(VAR,'evtin',1,5484) LexToken(ASSIGNMENT,'=',1,5489) @@ -1062,7 +1068,8 @@ LexToken(ASSIGNMENT,'=',1,5613) LexToken(OPENSQBRACKET,'[',1,5614) LexToken(NUMBER,'1',1,5615) LexToken(SEMICOLON,';',1,5616) -LexToken(NUMBER,'-31',1,5617) +LexToken(ADDITION,'-',1,5617) +LexToken(NUMBER,'31',1,5618) LexToken(SEMICOLON,';',1,5620) LexToken(NUMBER,'1',1,5621) LexToken(SEMICOLON,';',1,5622) @@ -1177,7 +1184,8 @@ LexToken(ASSIGNMENT,'=',1,6083) LexToken(OPENSQBRACKET,'[',1,6084) LexToken(NUMBER,'5',1,6085) LexToken(COMMA,',',1,6086) -LexToken(NUMBER,'-1',1,6087) +LexToken(ADDITION,'-',1,6087) +LexToken(NUMBER,'1',1,6088) LexToken(CLOSESQBRACKET,']',1,6089) LexToken(COMMA,',',1,6090) LexToken(VAR,'from',1,6102) @@ -1294,15 +1302,18 @@ LexToken(DQSTRING,'"output"',1,6568) LexToken(COMMA,',',1,6569) LexToken(VAR,'in',1,6581) LexToken(ASSIGNMENT,'=',1,6583) -LexToken(NUMBER,'-1',1,6584) +LexToken(ADDITION,'-',1,6584) +LexToken(NUMBER,'1',1,6585) LexToken(COMMA,',',1,6586) LexToken(VAR,'in2',1,6598) LexToken(ASSIGNMENT,'=',1,6601) -LexToken(NUMBER,'-2',1,6602) +LexToken(ADDITION,'-',1,6602) +LexToken(NUMBER,'2',1,6603) LexToken(COMMA,',',1,6604) LexToken(VAR,'intyp',1,6616) LexToken(ASSIGNMENT,'=',1,6621) -LexToken(NUMBER,'-1',1,6622) +LexToken(ADDITION,'-',1,6622) +LexToken(NUMBER,'1',1,6623) LexToken(COMMA,',',1,6624) LexToken(VAR,'out',1,6636) LexToken(ASSIGNMENT,'=',1,6639) @@ -1492,11 +1503,13 @@ LexToken(NUMBER,'1',1,7354) LexToken(COMMA,',',1,7355) LexToken(VAR,'out',1,7367) LexToken(ASSIGNMENT,'=',1,7370) -LexToken(NUMBER,'-1',1,7371) +LexToken(ADDITION,'-',1,7371) +LexToken(NUMBER,'1',1,7372) LexToken(COMMA,',',1,7373) LexToken(VAR,'out2',1,7385) LexToken(ASSIGNMENT,'=',1,7389) -LexToken(NUMBER,'-2',1,7390) +LexToken(ADDITION,'-',1,7390) +LexToken(NUMBER,'2',1,7391) LexToken(COMMA,',',1,7392) LexToken(VAR,'outtyp',1,7404) LexToken(ASSIGNMENT,'=',1,7410) diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 42eef932..eb294530 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -330,12 +330,15 @@ LexToken(COMMA,',',1,2424) LexToken(VAR,'list',1,2425) LexToken(OPENBRACKET,'(',1,2429) LexToken(OPENSQBRACKET,'[',1,2430) -LexToken(NUMBER,'-1',1,2431) +LexToken(ADDITION,'-',1,2431) +LexToken(NUMBER,'1',1,2432) LexToken(COMMA,',',1,2433) -LexToken(NUMBER,'-2',1,2434) +LexToken(ADDITION,'-',1,2434) +LexToken(NUMBER,'2',1,2435) LexToken(CLOSESQBRACKET,']',1,2436) LexToken(COMMA,',',1,2437) -LexToken(NUMBER,'-1',1,2438) +LexToken(ADDITION,'-',1,2438) +LexToken(NUMBER,'1',1,2439) LexToken(CLOSEBRACKET,')',1,2440) LexToken(COMMA,',',1,2441) LexToken(NUMBER,'1',1,2442) @@ -425,19 +428,22 @@ LexToken(VAR,'model',1,2860) LexToken(DOT,'.',1,2865) LexToken(VAR,'out',1,2866) LexToken(ASSIGNMENT,'=',1,2869) -LexToken(NUMBER,'-1',1,2870) +LexToken(ADDITION,'-',1,2870) +LexToken(NUMBER,'1',1,2871) LexToken(EOL,'\n',1,2872) LexToken(VAR,'model',1,2881) LexToken(DOT,'.',1,2886) LexToken(VAR,'out2',1,2887) LexToken(ASSIGNMENT,'=',1,2891) -LexToken(NUMBER,'-2',1,2892) +LexToken(ADDITION,'-',1,2892) +LexToken(NUMBER,'2',1,2893) LexToken(EOL,'\n',1,2894) LexToken(VAR,'model',1,2903) LexToken(DOT,'.',1,2908) LexToken(VAR,'outtyp',1,2909) LexToken(ASSIGNMENT,'=',1,2915) -LexToken(NUMBER,'-1',1,2916) +LexToken(ADDITION,'-',1,2916) +LexToken(NUMBER,'1',1,2917) LexToken(EOL,'\n',1,2918) LexToken(VAR,'model',1,2927) LexToken(DOT,'.',1,2932) diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 46de75c7..74a60f27 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -130,26 +130,32 @@ LexToken(OPENBRACKET,'(',1,1401) LexToken(DQSTRING,'"mat"',1,1406) LexToken(COMMA,',',1,1407) LexToken(OPENSQBRACKET,'[',1,1408) -LexToken(NUMBER,'-1',1,1409) +LexToken(ADDITION,'-',1,1409) +LexToken(NUMBER,'1',1,1410) LexToken(COMMA,',',1,1411) -LexToken(NUMBER,'-1',1,1412) +LexToken(ADDITION,'-',1,1412) +LexToken(NUMBER,'1',1,1413) LexToken(CLOSESQBRACKET,']',1,1414) LexToken(COMMA,',',1,1415) LexToken(DQSTRING,'"mat"',1,1420) LexToken(COMMA,',',1,1421) LexToken(OPENSQBRACKET,'[',1,1422) -LexToken(NUMBER,'-1',1,1423) +LexToken(ADDITION,'-',1,1423) +LexToken(NUMBER,'1',1,1424) LexToken(COMMA,',',1,1425) -LexToken(NUMBER,'-1',1,1426) +LexToken(ADDITION,'-',1,1426) +LexToken(NUMBER,'1',1,1427) LexToken(CLOSESQBRACKET,']',1,1428) LexToken(COMMA,',',1,1429) LexToken(DQSTRING,'"pol"',1,1434) LexToken(COMMA,',',1,1435) -LexToken(NUMBER,'-1',1,1436) +LexToken(ADDITION,'-',1,1436) +LexToken(NUMBER,'1',1,1437) LexToken(COMMA,',',1,1438) LexToken(DQSTRING,'"pol"',1,1443) LexToken(COMMA,',',1,1444) -LexToken(NUMBER,'-1',1,1445) +LexToken(ADDITION,'-',1,1445) +LexToken(NUMBER,'1',1,1446) LexToken(CLOSEBRACKET,')',1,1447) LexToken(EOL,'\n',1,1448) LexToken(SCICOS_CONTEXT,'scicos_context',1,1457) @@ -340,7 +346,8 @@ LexToken(OPENBRACKET,'(',1,2419) LexToken(VAR,'wpar',1,2431) LexToken(ASSIGNMENT,'=',1,2435) LexToken(OPENSQBRACKET,'[',1,2436) -LexToken(NUMBER,'-176.97473',1,2437) +LexToken(ADDITION,'-',1,2437) +LexToken(NUMBER,'176.97473',1,2438) LexToken(COMMA,',',1,2447) LexToken(NUMBER,'421.18646',1,2448) LexToken(COMMA,',',1,2457) @@ -380,7 +387,8 @@ LexToken(NUMBER,'0.000001',1,2565) LexToken(COMMA,',',1,2573) LexToken(NUMBER,'1.000',1,2574) LexToken(VAR,'D',1,2579) -LexToken(NUMBER,'-10',1,2580) +LexToken(ADDITION,'-',1,2580) +LexToken(NUMBER,'10',1,2581) LexToken(COMMA,',',1,2583) LexToken(NUMBER,'100001',1,2584) LexToken(COMMA,',',1,2590) @@ -868,7 +876,8 @@ LexToken(VAR,'opar',1,4839) LexToken(ASSIGNMENT,'=',1,4843) LexToken(VAR,'list',1,4844) LexToken(OPENBRACKET,'(',1,4848) -LexToken(NUMBER,'-1',1,4849) +LexToken(ADDITION,'-',1,4849) +LexToken(NUMBER,'1',1,4850) LexToken(CLOSEBRACKET,')',1,4851) LexToken(COMMA,',',1,4852) LexToken(VAR,'blocktype',1,4864) @@ -1236,38 +1245,47 @@ LexToken(COMMA,',',1,6426) LexToken(VAR,'in',1,6438) LexToken(ASSIGNMENT,'=',1,6440) LexToken(OPENSQBRACKET,'[',1,6441) -LexToken(NUMBER,'-1',1,6442) +LexToken(ADDITION,'-',1,6442) +LexToken(NUMBER,'1',1,6443) LexToken(SEMICOLON,';',1,6444) -LexToken(NUMBER,'-1',1,6445) +LexToken(ADDITION,'-',1,6445) +LexToken(NUMBER,'1',1,6446) LexToken(CLOSESQBRACKET,']',1,6447) LexToken(COMMA,',',1,6448) LexToken(VAR,'in2',1,6460) LexToken(ASSIGNMENT,'=',1,6463) LexToken(OPENSQBRACKET,'[',1,6464) -LexToken(NUMBER,'-2',1,6465) +LexToken(ADDITION,'-',1,6465) +LexToken(NUMBER,'2',1,6466) LexToken(SEMICOLON,';',1,6467) -LexToken(NUMBER,'-2',1,6468) +LexToken(ADDITION,'-',1,6468) +LexToken(NUMBER,'2',1,6469) LexToken(CLOSESQBRACKET,']',1,6470) LexToken(COMMA,',',1,6471) LexToken(VAR,'intyp',1,6483) LexToken(ASSIGNMENT,'=',1,6488) LexToken(OPENSQBRACKET,'[',1,6489) -LexToken(NUMBER,'-1',1,6490) +LexToken(ADDITION,'-',1,6490) +LexToken(NUMBER,'1',1,6491) LexToken(SEMICOLON,';',1,6492) -LexToken(NUMBER,'-1',1,6493) +LexToken(ADDITION,'-',1,6493) +LexToken(NUMBER,'1',1,6494) LexToken(CLOSESQBRACKET,']',1,6495) LexToken(COMMA,',',1,6496) LexToken(VAR,'out',1,6508) LexToken(ASSIGNMENT,'=',1,6511) -LexToken(NUMBER,'-1',1,6512) +LexToken(ADDITION,'-',1,6512) +LexToken(NUMBER,'1',1,6513) LexToken(COMMA,',',1,6514) LexToken(VAR,'out2',1,6526) LexToken(ASSIGNMENT,'=',1,6530) -LexToken(NUMBER,'-2',1,6531) +LexToken(ADDITION,'-',1,6531) +LexToken(NUMBER,'2',1,6532) LexToken(COMMA,',',1,6533) LexToken(VAR,'outtyp',1,6545) LexToken(ASSIGNMENT,'=',1,6551) -LexToken(NUMBER,'-1',1,6552) +LexToken(ADDITION,'-',1,6552) +LexToken(NUMBER,'1',1,6553) LexToken(COMMA,',',1,6554) LexToken(VAR,'evtin',1,6566) LexToken(ASSIGNMENT,'=',1,6571) @@ -1598,7 +1616,8 @@ LexToken(VAR,'list',1,7837) LexToken(OPENBRACKET,'(',1,7841) LexToken(DQSTRING,'"eselect"',1,7850) LexToken(COMMA,',',1,7851) -LexToken(NUMBER,'-2',1,7852) +LexToken(ADDITION,'-',1,7852) +LexToken(NUMBER,'2',1,7853) LexToken(CLOSEBRACKET,')',1,7854) LexToken(COMMA,',',1,7855) LexToken(VAR,'in',1,7867) @@ -1611,7 +1630,8 @@ LexToken(NUMBER,'1',1,7887) LexToken(COMMA,',',1,7888) LexToken(VAR,'intyp',1,7900) LexToken(ASSIGNMENT,'=',1,7905) -LexToken(NUMBER,'-1',1,7906) +LexToken(ADDITION,'-',1,7906) +LexToken(NUMBER,'1',1,7907) LexToken(COMMA,',',1,7908) LexToken(VAR,'out',1,7920) LexToken(ASSIGNMENT,'=',1,7923) @@ -1679,9 +1699,11 @@ LexToken(COMMA,',',1,8162) LexToken(VAR,'firing',1,8174) LexToken(ASSIGNMENT,'=',1,8180) LexToken(OPENSQBRACKET,'[',1,8181) -LexToken(NUMBER,'-1',1,8182) +LexToken(ADDITION,'-',1,8182) +LexToken(NUMBER,'1',1,8183) LexToken(SEMICOLON,';',1,8184) -LexToken(NUMBER,'-1',1,8185) +LexToken(ADDITION,'-',1,8185) +LexToken(NUMBER,'1',1,8186) LexToken(CLOSESQBRACKET,']',1,8187) LexToken(COMMA,',',1,8188) LexToken(VAR,'dep_ut',1,8200) @@ -1826,7 +1848,8 @@ LexToken(ASSIGNMENT,'=',1,8715) LexToken(OPENSQBRACKET,'[',1,8716) LexToken(NUMBER,'5',1,8717) LexToken(COMMA,',',1,8718) -LexToken(NUMBER,'-1',1,8719) +LexToken(ADDITION,'-',1,8719) +LexToken(NUMBER,'1',1,8720) LexToken(CLOSESQBRACKET,']',1,8721) LexToken(COMMA,',',1,8722) LexToken(VAR,'from',1,8734) @@ -1892,7 +1915,8 @@ LexToken(ASSIGNMENT,'=',1,8939) LexToken(OPENSQBRACKET,'[',1,8940) LexToken(NUMBER,'5',1,8941) LexToken(COMMA,',',1,8942) -LexToken(NUMBER,'-1',1,8943) +LexToken(ADDITION,'-',1,8943) +LexToken(NUMBER,'1',1,8944) LexToken(CLOSESQBRACKET,']',1,8945) LexToken(COMMA,',',1,8946) LexToken(VAR,'from',1,8958) @@ -2033,15 +2057,18 @@ LexToken(DQSTRING,'"output"',1,9513) LexToken(COMMA,',',1,9514) LexToken(VAR,'in',1,9526) LexToken(ASSIGNMENT,'=',1,9528) -LexToken(NUMBER,'-1',1,9529) +LexToken(ADDITION,'-',1,9529) +LexToken(NUMBER,'1',1,9530) LexToken(COMMA,',',1,9531) LexToken(VAR,'in2',1,9543) LexToken(ASSIGNMENT,'=',1,9546) -LexToken(NUMBER,'-2',1,9547) +LexToken(ADDITION,'-',1,9547) +LexToken(NUMBER,'2',1,9548) LexToken(COMMA,',',1,9549) LexToken(VAR,'intyp',1,9561) LexToken(ASSIGNMENT,'=',1,9566) -LexToken(NUMBER,'-1',1,9567) +LexToken(ADDITION,'-',1,9567) +LexToken(NUMBER,'1',1,9568) LexToken(COMMA,',',1,9569) LexToken(VAR,'out',1,9581) LexToken(ASSIGNMENT,'=',1,9584) @@ -2360,7 +2387,7 @@ LexToken(VAR,'rpar',1,10884) LexToken(ASSIGNMENT,'=',1,10888) LexToken(OPENSQBRACKET,'[',1,10889) LexToken(NUMBER,'1',1,10890) -LexToken(OPERATOR,'/',1,10891) +LexToken(MULTIPLICATION,'/',1,10891) LexToken(NUMBER,'2',1,10892) LexToken(SEMICOLON,';',1,10893) LexToken(NUMBER,'0',1,10894) @@ -2383,7 +2410,8 @@ LexToken(DQSTRING,'"d"',1,10962) LexToken(COMMA,',',1,10963) LexToken(VAR,'firing',1,10975) LexToken(ASSIGNMENT,'=',1,10981) -LexToken(NUMBER,'-1',1,10982) +LexToken(ADDITION,'-',1,10982) +LexToken(NUMBER,'1',1,10983) LexToken(COMMA,',',1,10984) LexToken(VAR,'dep_ut',1,10996) LexToken(ASSIGNMENT,'=',1,11002) @@ -2461,7 +2489,8 @@ LexToken(ASSIGNMENT,'=',1,11293) LexToken(OPENSQBRACKET,'[',1,11294) LexToken(NUMBER,'5',1,11295) LexToken(COMMA,',',1,11296) -LexToken(NUMBER,'-1',1,11297) +LexToken(ADDITION,'-',1,11297) +LexToken(NUMBER,'1',1,11298) LexToken(CLOSESQBRACKET,']',1,11299) LexToken(COMMA,',',1,11300) LexToken(VAR,'from',1,11312) @@ -2521,19 +2550,22 @@ LexToken(VAR,'model',1,11476) LexToken(DOT,'.',1,11481) LexToken(VAR,'out',1,11482) LexToken(ASSIGNMENT,'=',1,11485) -LexToken(NUMBER,'-1',1,11486) +LexToken(ADDITION,'-',1,11486) +LexToken(NUMBER,'1',1,11487) LexToken(EOL,'\n',1,11488) LexToken(VAR,'model',1,11497) LexToken(DOT,'.',1,11502) LexToken(VAR,'out2',1,11503) LexToken(ASSIGNMENT,'=',1,11507) -LexToken(NUMBER,'-2',1,11508) +LexToken(ADDITION,'-',1,11508) +LexToken(NUMBER,'2',1,11509) LexToken(EOL,'\n',1,11510) LexToken(VAR,'model',1,11519) LexToken(DOT,'.',1,11524) LexToken(VAR,'outtyp',1,11525) LexToken(ASSIGNMENT,'=',1,11531) -LexToken(NUMBER,'-1',1,11532) +LexToken(ADDITION,'-',1,11532) +LexToken(NUMBER,'1',1,11533) LexToken(EOL,'\n',1,11534) LexToken(VAR,'model',1,11543) LexToken(DOT,'.',1,11548) @@ -2642,7 +2674,8 @@ LexToken(CLOSEBRACKET,')',1,11911) LexToken(EOL,'\n',1,11912) LexToken(VAR,'Amin',1,11921) LexToken(ASSIGNMENT,'=',1,11925) -LexToken(NUMBER,'-1',1,11926) +LexToken(ADDITION,'-',1,11926) +LexToken(NUMBER,'1',1,11927) LexToken(EOL,'\n',1,11928) LexToken(VAR,'Amax',1,11937) LexToken(ASSIGNMENT,'=',1,11941) diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index f705621f..9c053287 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -125,7 +125,8 @@ LexToken(VAR,'model',1,1176) LexToken(DOT,'.',1,1181) LexToken(VAR,'outtyp',1,1182) LexToken(ASSIGNMENT,'=',1,1188) -LexToken(NUMBER,'-1',1,1189) +LexToken(ADDITION,'-',1,1189) +LexToken(NUMBER,'1',1,1190) LexToken(EOL,'\n',1,1191) LexToken(VAR,'model',1,1200) LexToken(DOT,'.',1,1205) diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index fa2c34f7..ecc49934 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -272,7 +272,8 @@ LexToken(DOT,'.',1,2163) LexToken(VAR,'out',1,2164) LexToken(ASSIGNMENT,'=',1,2167) LexToken(OPENSQBRACKET,'[',1,2168) -LexToken(NUMBER,'-1',1,2169) +LexToken(ADDITION,'-',1,2169) +LexToken(NUMBER,'1',1,2170) LexToken(CLOSESQBRACKET,']',1,2171) LexToken(EOL,'\n',1,2172) LexToken(VAR,'model',1,2181) diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index f0cecf03..dba8888b 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -185,7 +185,8 @@ LexToken(NUMBER,'1',1,1577) LexToken(COMMA,',',1,1578) LexToken(DQSTRING,'"vec"',1,1583) LexToken(COMMA,',',1,1584) -LexToken(NUMBER,'-1',1,1585) +LexToken(ADDITION,'-',1,1585) +LexToken(NUMBER,'1',1,1586) LexToken(COMMA,',',1,1587) LexToken(DQSTRING,'"vec"',1,1592) LexToken(COMMA,',',1,1593) @@ -264,7 +265,8 @@ LexToken(LOGICAL,'&',1,1941) LexToken(OPENBRACKET,'(',1,1942) LexToken(VAR,'ot',1,1943) LexToken(COMPARISON,'<>',1,1945) -LexToken(NUMBER,'-1',1,1947) +LexToken(ADDITION,'-',1,1947) +LexToken(NUMBER,'1',1,1948) LexToken(CLOSEBRACKET,')',1,1949) LexToken(CLOSEBRACKET,')',1,1950) LexToken(THEN,'then',1,1952) @@ -386,19 +388,22 @@ LexToken(VAR,'model',1,2623) LexToken(DOT,'.',1,2628) LexToken(VAR,'out',1,2629) LexToken(ASSIGNMENT,'=',1,2632) -LexToken(NUMBER,'-1',1,2633) +LexToken(ADDITION,'-',1,2633) +LexToken(NUMBER,'1',1,2634) LexToken(EOL,'\n',1,2635) LexToken(VAR,'model',1,2644) LexToken(DOT,'.',1,2649) LexToken(VAR,'out2',1,2650) LexToken(ASSIGNMENT,'=',1,2654) -LexToken(NUMBER,'-2',1,2655) +LexToken(ADDITION,'-',1,2655) +LexToken(NUMBER,'2',1,2656) LexToken(EOL,'\n',1,2657) LexToken(VAR,'model',1,2666) LexToken(DOT,'.',1,2671) LexToken(VAR,'outtyp',1,2672) LexToken(ASSIGNMENT,'=',1,2678) -LexToken(NUMBER,'-1',1,2679) +LexToken(ADDITION,'-',1,2679) +LexToken(NUMBER,'1',1,2680) LexToken(EOL,'\n',1,2681) LexToken(VAR,'model',1,2690) LexToken(DOT,'.',1,2695) diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 79fbd94d..195e7cca 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -128,21 +128,26 @@ LexToken(VAR,'list',1,1351) LexToken(OPENBRACKET,'(',1,1355) LexToken(DQSTRING,'"pol"',1,1360) LexToken(COMMA,',',1,1361) -LexToken(NUMBER,'-1',1,1362) +LexToken(ADDITION,'-',1,1362) +LexToken(NUMBER,'1',1,1363) LexToken(COMMA,',',1,1364) LexToken(DQSTRING,'"pol"',1,1369) LexToken(COMMA,',',1,1370) -LexToken(NUMBER,'-1',1,1371) +LexToken(ADDITION,'-',1,1371) +LexToken(NUMBER,'1',1,1372) LexToken(COMMA,',',1,1373) LexToken(DQSTRING,'"pol"',1,1378) LexToken(COMMA,',',1,1379) -LexToken(NUMBER,'-1',1,1380) +LexToken(ADDITION,'-',1,1380) +LexToken(NUMBER,'1',1,1381) LexToken(COMMA,',',1,1382) LexToken(DQSTRING,'"mat"',1,1387) LexToken(COMMA,',',1,1388) LexToken(OPENSQBRACKET,'[',1,1389) -LexToken(NUMBER,'-1',1,1390) -LexToken(NUMBER,'-1',1,1393) +LexToken(ADDITION,'-',1,1390) +LexToken(NUMBER,'1',1,1391) +LexToken(ADDITION,'-',1,1393) +LexToken(NUMBER,'1',1,1394) LexToken(CLOSESQBRACKET,']',1,1395) LexToken(CLOSEBRACKET,')',1,1396) LexToken(EOL,'\n',1,1397) @@ -348,7 +353,8 @@ LexToken(OPENBRACKET,'(',1,2431) LexToken(VAR,'wpar',1,2443) LexToken(ASSIGNMENT,'=',1,2447) LexToken(OPENSQBRACKET,'[',1,2448) -LexToken(NUMBER,'-162.7581',1,2449) +LexToken(ADDITION,'-',1,2449) +LexToken(NUMBER,'162.7581',1,2450) LexToken(COMMA,',',1,2458) LexToken(NUMBER,'435.54369',1,2459) LexToken(COMMA,',',1,2468) @@ -392,7 +398,8 @@ LexToken(NUMBER,'0.000001',1,2608) LexToken(SEMICOLON,';',1,2616) LexToken(NUMBER,'1.000',1,2617) LexToken(VAR,'D',1,2622) -LexToken(NUMBER,'-10',1,2623) +LexToken(ADDITION,'-',1,2623) +LexToken(NUMBER,'10',1,2624) LexToken(SEMICOLON,';',1,2626) LexToken(NUMBER,'100001',1,2627) LexToken(SEMICOLON,';',1,2633) @@ -830,7 +837,8 @@ LexToken(NUMBER,'1',1,4541) LexToken(COMMA,',',1,4542) LexToken(VAR,'outtyp',1,4554) LexToken(ASSIGNMENT,'=',1,4560) -LexToken(NUMBER,'-1',1,4561) +LexToken(ADDITION,'-',1,4561) +LexToken(NUMBER,'1',1,4562) LexToken(COMMA,',',1,4563) LexToken(VAR,'evtin',1,4575) LexToken(ASSIGNMENT,'=',1,4580) @@ -1032,38 +1040,47 @@ LexToken(COMMA,',',1,5392) LexToken(VAR,'in',1,5404) LexToken(ASSIGNMENT,'=',1,5406) LexToken(OPENSQBRACKET,'[',1,5407) -LexToken(NUMBER,'-1',1,5408) +LexToken(ADDITION,'-',1,5408) +LexToken(NUMBER,'1',1,5409) LexToken(SEMICOLON,';',1,5410) -LexToken(NUMBER,'-1',1,5411) +LexToken(ADDITION,'-',1,5411) +LexToken(NUMBER,'1',1,5412) LexToken(CLOSESQBRACKET,']',1,5413) LexToken(COMMA,',',1,5414) LexToken(VAR,'in2',1,5426) LexToken(ASSIGNMENT,'=',1,5429) LexToken(OPENSQBRACKET,'[',1,5430) -LexToken(NUMBER,'-2',1,5431) +LexToken(ADDITION,'-',1,5431) +LexToken(NUMBER,'2',1,5432) LexToken(SEMICOLON,';',1,5433) -LexToken(NUMBER,'-2',1,5434) +LexToken(ADDITION,'-',1,5434) +LexToken(NUMBER,'2',1,5435) LexToken(CLOSESQBRACKET,']',1,5436) LexToken(COMMA,',',1,5437) LexToken(VAR,'intyp',1,5449) LexToken(ASSIGNMENT,'=',1,5454) LexToken(OPENSQBRACKET,'[',1,5455) -LexToken(NUMBER,'-1',1,5456) +LexToken(ADDITION,'-',1,5456) +LexToken(NUMBER,'1',1,5457) LexToken(SEMICOLON,';',1,5458) -LexToken(NUMBER,'-1',1,5459) +LexToken(ADDITION,'-',1,5459) +LexToken(NUMBER,'1',1,5460) LexToken(CLOSESQBRACKET,']',1,5461) LexToken(COMMA,',',1,5462) LexToken(VAR,'out',1,5474) LexToken(ASSIGNMENT,'=',1,5477) -LexToken(NUMBER,'-1',1,5478) +LexToken(ADDITION,'-',1,5478) +LexToken(NUMBER,'1',1,5479) LexToken(COMMA,',',1,5480) LexToken(VAR,'out2',1,5492) LexToken(ASSIGNMENT,'=',1,5496) -LexToken(NUMBER,'-2',1,5497) +LexToken(ADDITION,'-',1,5497) +LexToken(NUMBER,'2',1,5498) LexToken(COMMA,',',1,5499) LexToken(VAR,'outtyp',1,5511) LexToken(ASSIGNMENT,'=',1,5517) -LexToken(NUMBER,'-1',1,5518) +LexToken(ADDITION,'-',1,5518) +LexToken(NUMBER,'1',1,5519) LexToken(COMMA,',',1,5520) LexToken(VAR,'evtin',1,5532) LexToken(ASSIGNMENT,'=',1,5537) @@ -1466,7 +1483,8 @@ LexToken(DQSTRING,'"d"',1,7109) LexToken(COMMA,',',1,7110) LexToken(VAR,'firing',1,7122) LexToken(ASSIGNMENT,'=',1,7128) -LexToken(NUMBER,'-1',1,7129) +LexToken(ADDITION,'-',1,7129) +LexToken(NUMBER,'1',1,7130) LexToken(COMMA,',',1,7131) LexToken(VAR,'dep_ut',1,7143) LexToken(ASSIGNMENT,'=',1,7149) @@ -1676,7 +1694,8 @@ LexToken(DQSTRING,'"d"',1,8024) LexToken(COMMA,',',1,8025) LexToken(VAR,'firing',1,8037) LexToken(ASSIGNMENT,'=',1,8043) -LexToken(NUMBER,'-1',1,8044) +LexToken(ADDITION,'-',1,8044) +LexToken(NUMBER,'1',1,8045) LexToken(COMMA,',',1,8046) LexToken(VAR,'dep_ut',1,8058) LexToken(ASSIGNMENT,'=',1,8064) @@ -1762,7 +1781,8 @@ LexToken(ASSIGNMENT,'=',1,8394) LexToken(OPENSQBRACKET,'[',1,8395) LexToken(NUMBER,'5',1,8396) LexToken(COMMA,',',1,8397) -LexToken(NUMBER,'-1',1,8398) +LexToken(ADDITION,'-',1,8398) +LexToken(NUMBER,'1',1,8399) LexToken(CLOSESQBRACKET,']',1,8400) LexToken(COMMA,',',1,8401) LexToken(VAR,'from',1,8413) @@ -1836,7 +1856,8 @@ LexToken(ASSIGNMENT,'=',1,8658) LexToken(OPENSQBRACKET,'[',1,8659) LexToken(NUMBER,'5',1,8660) LexToken(COMMA,',',1,8661) -LexToken(NUMBER,'-1',1,8662) +LexToken(ADDITION,'-',1,8662) +LexToken(NUMBER,'1',1,8663) LexToken(CLOSESQBRACKET,']',1,8664) LexToken(COMMA,',',1,8665) LexToken(VAR,'from',1,8677) @@ -1953,15 +1974,18 @@ LexToken(DQSTRING,'"output"',1,9148) LexToken(COMMA,',',1,9149) LexToken(VAR,'in',1,9161) LexToken(ASSIGNMENT,'=',1,9163) -LexToken(NUMBER,'-1',1,9164) +LexToken(ADDITION,'-',1,9164) +LexToken(NUMBER,'1',1,9165) LexToken(COMMA,',',1,9166) LexToken(VAR,'in2',1,9178) LexToken(ASSIGNMENT,'=',1,9181) -LexToken(NUMBER,'-2',1,9182) +LexToken(ADDITION,'-',1,9182) +LexToken(NUMBER,'2',1,9183) LexToken(COMMA,',',1,9184) LexToken(VAR,'intyp',1,9196) LexToken(ASSIGNMENT,'=',1,9201) -LexToken(NUMBER,'-1',1,9202) +LexToken(ADDITION,'-',1,9202) +LexToken(NUMBER,'1',1,9203) LexToken(COMMA,',',1,9204) LexToken(VAR,'out',1,9216) LexToken(ASSIGNMENT,'=',1,9219) @@ -2163,19 +2187,22 @@ LexToken(VAR,'model',1,9966) LexToken(DOT,'.',1,9971) LexToken(VAR,'out',1,9972) LexToken(ASSIGNMENT,'=',1,9975) -LexToken(NUMBER,'-1',1,9976) +LexToken(ADDITION,'-',1,9976) +LexToken(NUMBER,'1',1,9977) LexToken(EOL,'\n',1,9978) LexToken(VAR,'model',1,9987) LexToken(DOT,'.',1,9992) LexToken(VAR,'out2',1,9993) LexToken(ASSIGNMENT,'=',1,9997) -LexToken(NUMBER,'-2',1,9998) +LexToken(ADDITION,'-',1,9998) +LexToken(NUMBER,'2',1,9999) LexToken(EOL,'\n',1,10000) LexToken(VAR,'model',1,10009) LexToken(DOT,'.',1,10014) LexToken(VAR,'outtyp',1,10015) LexToken(ASSIGNMENT,'=',1,10021) -LexToken(NUMBER,'-1',1,10022) +LexToken(ADDITION,'-',1,10022) +LexToken(NUMBER,'1',1,10023) LexToken(EOL,'\n',1,10024) LexToken(VAR,'model',1,10033) LexToken(DOT,'.',1,10038) diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 1f30adff..754dc86e 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -192,7 +192,8 @@ LexToken(NUMBER,'1',1,1733) LexToken(COMMA,',',1,1734) LexToken(DQSTRING,'"vec"',1,1739) LexToken(COMMA,',',1,1740) -LexToken(NUMBER,'-1',1,1741) +LexToken(ADDITION,'-',1,1741) +LexToken(NUMBER,'1',1,1742) LexToken(COMMA,',',1,1743) LexToken(DQSTRING,'"vec"',1,1748) LexToken(COMMA,',',1,1749) @@ -284,7 +285,7 @@ LexToken(OPENSQBRACKET,'[',1,2156) LexToken(VAR,'seed_c',1,2157) LexToken(SEMICOLON,';',1,2163) LexToken(NUMBER,'0',1,2164) -LexToken(OPERATOR,'*',1,2165) +LexToken(MULTIPLICATION,'*',1,2165) LexToken(VAR,'a',1,2166) LexToken(OPENBRACKET,'(',1,2167) LexToken(COLON,':',1,2168) @@ -368,17 +369,18 @@ LexToken(OPENBRACKET,'(',1,2503) LexToken(VAR,'rand',1,2504) LexToken(OPENBRACKET,'(',1,2508) LexToken(CLOSEBRACKET,')',1,2509) -LexToken(OPERATOR,'*',1,2510) +LexToken(MULTIPLICATION,'*',1,2510) LexToken(OPENBRACKET,'(',1,2511) LexToken(NUMBER,'10',1,2512) -LexToken(OPERATOR,'^',1,2514) +LexToken(MULTIPLICATION,'^',1,2514) LexToken(NUMBER,'7',1,2515) -LexToken(NUMBER,'-1',1,2516) +LexToken(ADDITION,'-',1,2516) +LexToken(NUMBER,'1',1,2517) LexToken(CLOSEBRACKET,')',1,2518) LexToken(CLOSEBRACKET,')',1,2519) LexToken(SEMICOLON,';',1,2520) LexToken(NUMBER,'0',1,2521) -LexToken(OPERATOR,'*',1,2522) +LexToken(MULTIPLICATION,'*',1,2522) LexToken(VAR,'a',1,2523) LexToken(OPENBRACKET,'(',1,2524) LexToken(COLON,':',1,2525) diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 5e856563..4648d3e1 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -168,8 +168,10 @@ LexToken(COMMA,',',1,1589) LexToken(DQSTRING,'"mat"',1,1594) LexToken(COMMA,',',1,1595) LexToken(OPENSQBRACKET,'[',1,1596) -LexToken(NUMBER,'-1',1,1597) -LexToken(NUMBER,'-2',1,1600) +LexToken(ADDITION,'-',1,1597) +LexToken(NUMBER,'1',1,1598) +LexToken(ADDITION,'-',1,1600) +LexToken(NUMBER,'2',1,1601) LexToken(CLOSESQBRACKET,']',1,1602) LexToken(COMMA,',',1,1603) LexToken(DQSTRING,'"mat"',1,1608) @@ -265,7 +267,7 @@ LexToken(NUMBER,'1',1,2013) LexToken(CLOSEBRACKET,')',1,2014) LexToken(SEMICOLON,';',1,2015) LexToken(NUMBER,'0',1,2016) -LexToken(OPERATOR,'*',1,2017) +LexToken(MULTIPLICATION,'*',1,2017) LexToken(VAR,'real',1,2018) LexToken(OPENBRACKET,'(',1,2022) LexToken(VAR,'a',1,2023) @@ -343,7 +345,7 @@ LexToken(COLON,':',1,2280) LexToken(CLOSEBRACKET,')',1,2281) LexToken(SEMICOLON,';',1,2282) LexToken(NUMBER,'0',1,2283) -LexToken(OPERATOR,'*',1,2284) +LexToken(MULTIPLICATION,'*',1,2284) LexToken(OPENSQBRACKET,'[',1,2285) LexToken(VAR,'real',1,2286) LexToken(OPENBRACKET,'(',1,2290) @@ -584,17 +586,18 @@ LexToken(OPENBRACKET,'(',1,3336) LexToken(VAR,'rand',1,3337) LexToken(OPENBRACKET,'(',1,3341) LexToken(CLOSEBRACKET,')',1,3342) -LexToken(OPERATOR,'*',1,3343) +LexToken(MULTIPLICATION,'*',1,3343) LexToken(OPENBRACKET,'(',1,3344) LexToken(NUMBER,'10',1,3345) -LexToken(OPERATOR,'^',1,3347) +LexToken(MULTIPLICATION,'^',1,3347) LexToken(NUMBER,'7',1,3348) -LexToken(NUMBER,'-1',1,3349) +LexToken(ADDITION,'-',1,3349) +LexToken(NUMBER,'1',1,3350) LexToken(CLOSEBRACKET,')',1,3351) LexToken(CLOSEBRACKET,')',1,3352) LexToken(SEMICOLON,';',1,3353) LexToken(NUMBER,'0',1,3354) -LexToken(OPERATOR,'*',1,3355) +LexToken(MULTIPLICATION,'*',1,3355) LexToken(VAR,'a',1,3356) LexToken(OPENBRACKET,'(',1,3357) LexToken(COLON,':',1,3358) @@ -687,12 +690,13 @@ LexToken(OPENBRACKET,'(',1,3592) LexToken(VAR,'rand',1,3593) LexToken(OPENBRACKET,'(',1,3597) LexToken(CLOSEBRACKET,')',1,3598) -LexToken(OPERATOR,'*',1,3599) +LexToken(MULTIPLICATION,'*',1,3599) LexToken(OPENBRACKET,'(',1,3600) LexToken(NUMBER,'10',1,3601) -LexToken(OPERATOR,'^',1,3603) +LexToken(MULTIPLICATION,'^',1,3603) LexToken(NUMBER,'7',1,3604) -LexToken(NUMBER,'-1',1,3605) +LexToken(ADDITION,'-',1,3605) +LexToken(NUMBER,'1',1,3606) LexToken(CLOSEBRACKET,')',1,3607) LexToken(CLOSEBRACKET,')',1,3608) LexToken(CLOSESQBRACKET,']',1,3609) diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 7f4ca811..5c186737 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -110,7 +110,7 @@ LexToken(EOL,'\n',1,1194) LexToken(VAR,'imask',1,1203) LexToken(ASSIGNMENT,'=',1,1208) LexToken(NUMBER,'9',1,1209) -LexToken(OPERATOR,'+',1,1210) +LexToken(ADDITION,'+',1,1210) LexToken(VAR,'ipar',1,1211) LexToken(OPENBRACKET,'(',1,1215) LexToken(NUMBER,'1',1,1216) @@ -518,26 +518,28 @@ LexToken(CLOSEBRACKET,')',1,3788) LexToken(COMPARISON,'<>',1,3789) LexToken(OPENBRACKET,'(',1,3791) LexToken(VAR,'N',1,3792) -LexToken(OPERATOR,'*',1,3793) +LexToken(MULTIPLICATION,'*',1,3793) LexToken(VAR,'M',1,3794) LexToken(CLOSEBRACKET,')',1,3795) -LexToken(OPERATOR,'+',1,3796) +LexToken(ADDITION,'+',1,3796) LexToken(NUMBER,'3',1,3797) LexToken(THEN,'then',1,3799) LexToken(EOL,'\n',1,3803) LexToken(VAR,'dstate',1,3828) LexToken(ASSIGNMENT,'=',1,3834) LexToken(OPENSQBRACKET,'[',1,3835) -LexToken(NUMBER,'-1',1,3836) +LexToken(ADDITION,'-',1,3836) +LexToken(NUMBER,'1',1,3837) LexToken(SEMICOLON,';',1,3838) -LexToken(NUMBER,'-1',1,3839) +LexToken(ADDITION,'-',1,3839) +LexToken(NUMBER,'1',1,3840) LexToken(SEMICOLON,';',1,3841) LexToken(VAR,'lunit',1,3842) LexToken(SEMICOLON,';',1,3847) LexToken(VAR,'zeros',1,3848) LexToken(OPENBRACKET,'(',1,3853) LexToken(VAR,'N',1,3854) -LexToken(OPERATOR,'*',1,3855) +LexToken(MULTIPLICATION,'*',1,3855) LexToken(VAR,'M',1,3856) LexToken(COMMA,',',1,3857) LexToken(NUMBER,'1',1,3858) @@ -686,7 +688,7 @@ LexToken(SEMICOLON,';',1,4516) LexToken(VAR,'zeros',1,4517) LexToken(OPENBRACKET,'(',1,4522) LexToken(VAR,'N',1,4523) -LexToken(OPERATOR,'*',1,4524) +LexToken(MULTIPLICATION,'*',1,4524) LexToken(VAR,'M',1,4525) LexToken(COMMA,',',1,4526) LexToken(NUMBER,'1',1,4527) diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 26eee9f1..1840e726 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -112,7 +112,7 @@ LexToken(EOL,'\n',1,1208) LexToken(VAR,'imask',1,1217) LexToken(ASSIGNMENT,'=',1,1223) LexToken(NUMBER,'9',1,1225) -LexToken(OPERATOR,'+',1,1226) +LexToken(ADDITION,'+',1,1226) LexToken(VAR,'ipar',1,1227) LexToken(OPENBRACKET,'(',1,1231) LexToken(NUMBER,'1',1,1232) @@ -240,11 +240,13 @@ LexToken(VAR,'list',1,1845) LexToken(OPENBRACKET,'(',1,1849) LexToken(DQSTRING,'"vec"',1,1854) LexToken(COMMA,',',1,1855) -LexToken(NUMBER,'-1',1,1857) +LexToken(ADDITION,'-',1,1857) +LexToken(NUMBER,'1',1,1858) LexToken(COMMA,',',1,1859) LexToken(DQSTRING,'"vec"',1,1865) LexToken(COMMA,',',1,1866) -LexToken(NUMBER,'-1',1,1868) +LexToken(ADDITION,'-',1,1868) +LexToken(NUMBER,'1',1,1869) LexToken(COMMA,',',1,1870) LexToken(DQSTRING,'"str"',1,1876) LexToken(COMMA,',',1,1877) @@ -426,7 +428,7 @@ LexToken(COMMA,',',1,2708) LexToken(VAR,'gettext',1,2729) LexToken(OPENBRACKET,'(',1,2736) LexToken(DQSTRING,'"Valid formats are: "',1,2757) -LexToken(OPERATOR,'+',1,2759) +LexToken(ADDITION,'+',1,2759) LexToken(VAR,'strcat',1,2761) LexToken(OPENBRACKET,'(',1,2767) LexToken(VAR,'fmts',1,2768) @@ -644,12 +646,12 @@ LexToken(VAR,'gettext',1,4240) LexToken(OPENBRACKET,'(',1,4247) LexToken(DQSTRING,'"[1, Record Size = "',1,4267) LexToken(CLOSEBRACKET,')',1,4268) -LexToken(OPERATOR,'+',1,4270) +LexToken(ADDITION,'+',1,4270) LexToken(VAR,'string',1,4272) LexToken(OPENBRACKET,'(',1,4279) LexToken(VAR,'M',1,4280) LexToken(CLOSEBRACKET,')',1,4281) -LexToken(OPERATOR,'+',1,4282) +LexToken(ADDITION,'+',1,4282) LexToken(DQSTRING,'"]"',1,4285) LexToken(CLOSEBRACKET,')',1,4286) LexToken(CLOSEBRACKET,')',1,4287) @@ -721,12 +723,12 @@ LexToken(VAR,'gettext',1,4777) LexToken(OPENBRACKET,'(',1,4784) LexToken(DQSTRING,'"[1, Record Size = "',1,4804) LexToken(CLOSEBRACKET,')',1,4805) -LexToken(OPERATOR,'+',1,4807) +LexToken(ADDITION,'+',1,4807) LexToken(VAR,'string',1,4809) LexToken(OPENBRACKET,'(',1,4816) LexToken(VAR,'M',1,4817) LexToken(CLOSEBRACKET,')',1,4818) -LexToken(OPERATOR,'+',1,4819) +LexToken(ADDITION,'+',1,4819) LexToken(DQSTRING,'"]"',1,4822) LexToken(CLOSEBRACKET,')',1,4823) LexToken(CLOSEBRACKET,')',1,4824) @@ -788,12 +790,12 @@ LexToken(VAR,'gettext',1,5135) LexToken(OPENBRACKET,'(',1,5142) LexToken(DQSTRING,'"[1, Record Size = "',1,5162) LexToken(CLOSEBRACKET,')',1,5163) -LexToken(OPERATOR,'+',1,5165) +LexToken(ADDITION,'+',1,5165) LexToken(VAR,'string',1,5167) LexToken(OPENBRACKET,'(',1,5174) LexToken(VAR,'M',1,5175) LexToken(CLOSEBRACKET,')',1,5176) -LexToken(OPERATOR,'+',1,5177) +LexToken(ADDITION,'+',1,5177) LexToken(DQSTRING,'"]"',1,5180) LexToken(CLOSEBRACKET,')',1,5181) LexToken(CLOSEBRACKET,')',1,5182) @@ -1001,7 +1003,8 @@ LexToken(VAR,'model',1,6406) LexToken(DOT,'.',1,6411) LexToken(VAR,'firing',1,6412) LexToken(ASSIGNMENT,'=',1,6419) -LexToken(NUMBER,'-1',1,6421) +LexToken(ADDITION,'-',1,6421) +LexToken(NUMBER,'1',1,6422) LexToken(EOL,'\n',1,6423) LexToken(ELSE,'else',1,6444) LexToken(EOL,'\n',1,6448) @@ -1063,26 +1066,28 @@ LexToken(CLOSEBRACKET,')',1,6950) LexToken(COMPARISON,'<>',1,6952) LexToken(OPENBRACKET,'(',1,6955) LexToken(VAR,'N',1,6956) -LexToken(OPERATOR,'*',1,6957) +LexToken(MULTIPLICATION,'*',1,6957) LexToken(VAR,'M',1,6958) LexToken(CLOSEBRACKET,')',1,6959) -LexToken(OPERATOR,'+',1,6961) +LexToken(ADDITION,'+',1,6961) LexToken(NUMBER,'3',1,6963) LexToken(THEN,'then',1,6965) LexToken(EOL,'\n',1,6969) LexToken(VAR,'dstate',1,6994) LexToken(ASSIGNMENT,'=',1,7001) LexToken(OPENSQBRACKET,'[',1,7003) -LexToken(NUMBER,'-1',1,7004) +LexToken(ADDITION,'-',1,7004) +LexToken(NUMBER,'1',1,7005) LexToken(SEMICOLON,';',1,7006) -LexToken(NUMBER,'-1',1,7008) +LexToken(ADDITION,'-',1,7008) +LexToken(NUMBER,'1',1,7009) LexToken(SEMICOLON,';',1,7010) LexToken(VAR,'lunit',1,7012) LexToken(SEMICOLON,';',1,7017) LexToken(VAR,'zeros',1,7019) LexToken(OPENBRACKET,'(',1,7024) LexToken(VAR,'N',1,7025) -LexToken(OPERATOR,'*',1,7026) +LexToken(MULTIPLICATION,'*',1,7026) LexToken(VAR,'M',1,7027) LexToken(COMMA,',',1,7028) LexToken(NUMBER,'1',1,7030) @@ -1282,7 +1287,7 @@ LexToken(SEMICOLON,';',1,7922) LexToken(VAR,'zeros',1,7924) LexToken(OPENBRACKET,'(',1,7929) LexToken(VAR,'N',1,7930) -LexToken(OPERATOR,'*',1,7931) +LexToken(MULTIPLICATION,'*',1,7931) LexToken(VAR,'M',1,7932) LexToken(COMMA,',',1,7933) LexToken(NUMBER,'1',1,7934) @@ -1336,7 +1341,8 @@ LexToken(VAR,'model',1,8141) LexToken(DOT,'.',1,8146) LexToken(VAR,'firing',1,8147) LexToken(ASSIGNMENT,'=',1,8154) -LexToken(NUMBER,'-1',1,8156) +LexToken(ADDITION,'-',1,8156) +LexToken(NUMBER,'1',1,8157) LexToken(EOL,'\n',1,8158) LexToken(VAR,'model',1,8167) LexToken(DOT,'.',1,8172) diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index e0d02515..a67780b3 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -122,12 +122,12 @@ LexToken(EOL,'\n',1,1234) LexToken(VAR,'imask',1,1243) LexToken(ASSIGNMENT,'=',1,1249) LexToken(NUMBER,'5',1,1251) -LexToken(OPERATOR,'+',1,1252) +LexToken(ADDITION,'+',1,1252) LexToken(VAR,'ipar',1,1253) LexToken(OPENBRACKET,'(',1,1257) LexToken(NUMBER,'1',1,1258) LexToken(CLOSEBRACKET,')',1,1259) -LexToken(OPERATOR,'+',1,1260) +LexToken(ADDITION,'+',1,1260) LexToken(VAR,'ipar',1,1261) LexToken(OPENBRACKET,'(',1,1265) LexToken(NUMBER,'2',1,1266) @@ -274,11 +274,13 @@ LexToken(VAR,'list',1,2051) LexToken(OPENBRACKET,'(',1,2055) LexToken(DQSTRING,'"vec"',1,2060) LexToken(COMMA,',',1,2061) -LexToken(NUMBER,'-1',1,2062) +LexToken(ADDITION,'-',1,2062) +LexToken(NUMBER,'1',1,2063) LexToken(COMMA,',',1,2064) LexToken(DQSTRING,'"vec"',1,2069) LexToken(COMMA,',',1,2070) -LexToken(NUMBER,'-1',1,2071) +LexToken(ADDITION,'-',1,2071) +LexToken(NUMBER,'1',1,2072) LexToken(COMMA,',',1,2073) LexToken(DQSTRING,'"str"',1,2078) LexToken(COMMA,',',1,2079) @@ -849,21 +851,23 @@ LexToken(CLOSEBRACKET,')',1,5900) LexToken(COMPARISON,'<>',1,5902) LexToken(OPENBRACKET,'(',1,5905) LexToken(VAR,'nout',1,5906) -LexToken(OPERATOR,'+',1,5910) +LexToken(ADDITION,'+',1,5910) LexToken(VAR,'ievt',1,5911) LexToken(CLOSEBRACKET,')',1,5915) -LexToken(OPERATOR,'*',1,5916) +LexToken(MULTIPLICATION,'*',1,5916) LexToken(VAR,'N',1,5917) -LexToken(OPERATOR,'+',1,5919) +LexToken(ADDITION,'+',1,5919) LexToken(NUMBER,'3',1,5921) LexToken(THEN,'then',1,5923) LexToken(EOL,'\n',1,5927) LexToken(VAR,'dstate',1,5952) LexToken(ASSIGNMENT,'=',1,5959) LexToken(OPENSQBRACKET,'[',1,5961) -LexToken(NUMBER,'-1',1,5962) +LexToken(ADDITION,'-',1,5962) +LexToken(NUMBER,'1',1,5963) LexToken(SEMICOLON,';',1,5965) -LexToken(NUMBER,'-1',1,5967) +LexToken(ADDITION,'-',1,5967) +LexToken(NUMBER,'1',1,5968) LexToken(SEMICOLON,';',1,5969) LexToken(VAR,'lunit',1,5971) LexToken(SEMICOLON,';',1,5976) @@ -871,10 +875,10 @@ LexToken(VAR,'zeros',1,5978) LexToken(OPENBRACKET,'(',1,5983) LexToken(OPENBRACKET,'(',1,5984) LexToken(VAR,'nout',1,5985) -LexToken(OPERATOR,'+',1,5990) +LexToken(ADDITION,'+',1,5990) LexToken(VAR,'ievt',1,5992) LexToken(CLOSEBRACKET,')',1,5996) -LexToken(OPERATOR,'*',1,5998) +LexToken(MULTIPLICATION,'*',1,5998) LexToken(VAR,'N',1,6000) LexToken(COMMA,',',1,6001) LexToken(NUMBER,'1',1,6003) @@ -1019,7 +1023,7 @@ LexToken(OPENBRACKET,'(',1,6701) LexToken(OPENBRACKET,'(',1,6702) LexToken(VAR,'nout',1,6703) LexToken(CLOSEBRACKET,')',1,6707) -LexToken(OPERATOR,'*',1,6708) +LexToken(MULTIPLICATION,'*',1,6708) LexToken(VAR,'N',1,6709) LexToken(COMMA,',',1,6710) LexToken(NUMBER,'1',1,6712) diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index bdf61da6..88949608 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -150,11 +150,13 @@ LexToken(NUMBER,'1',1,1423) LexToken(COMMA,',',1,1424) LexToken(DQSTRING,'"vec"',1,1429) LexToken(COMMA,',',1,1430) -LexToken(NUMBER,'-1',1,1431) +LexToken(ADDITION,'-',1,1431) +LexToken(NUMBER,'1',1,1432) LexToken(COMMA,',',1,1433) LexToken(DQSTRING,'"vec"',1,1438) LexToken(COMMA,',',1,1439) -LexToken(NUMBER,'-1',1,1440) +LexToken(ADDITION,'-',1,1440) +LexToken(NUMBER,'1',1,1441) LexToken(CLOSEBRACKET,')',1,1442) LexToken(COMMA,',',1,1443) LexToken(VAR,'exprs',1,1445) @@ -216,7 +218,7 @@ LexToken(EOL,'\n',1,1634) LexToken(VAR,'in',1,1655) LexToken(ASSIGNMENT,'=',1,1657) LexToken(VAR,'in',1,1658) -LexToken(OPERATOR,'*',1,1660) +LexToken(MULTIPLICATION,'*',1,1660) LexToken(VAR,'ones',1,1661) LexToken(OPENBRACKET,'(',1,1665) LexToken(VAR,'fi',1,1666) @@ -236,7 +238,7 @@ LexToken(EOL,'\n',1,1713) LexToken(VAR,'fi',1,1734) LexToken(ASSIGNMENT,'=',1,1736) LexToken(VAR,'fi',1,1737) -LexToken(OPERATOR,'*',1,1739) +LexToken(MULTIPLICATION,'*',1,1739) LexToken(VAR,'ones',1,1740) LexToken(OPENBRACKET,'(',1,1744) LexToken(VAR,'in',1,1745) diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index c45150d5..4fe5cc7a 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -162,7 +162,7 @@ LexToken(EOL,'\n',1,1358) LexToken(VAR,'spath',1,1375) LexToken(OPENBRACKET,'(',1,1380) LexToken(LASTINDEX,'$',1,1381) -LexToken(OPERATOR,'+',1,1382) +LexToken(ADDITION,'+',1,1382) LexToken(NUMBER,'1',1,1383) LexToken(CLOSEBRACKET,')',1,1384) LexToken(ASSIGNMENT,'=',1,1385) @@ -171,7 +171,7 @@ LexToken(EOL,'\n',1,1393) LexToken(VAR,'spath',1,1410) LexToken(OPENBRACKET,'(',1,1415) LexToken(LASTINDEX,'$',1,1416) -LexToken(OPERATOR,'+',1,1417) +LexToken(ADDITION,'+',1,1417) LexToken(NUMBER,'1',1,1418) LexToken(CLOSEBRACKET,')',1,1419) LexToken(ASSIGNMENT,'=',1,1420) @@ -180,7 +180,7 @@ LexToken(EOL,'\n',1,1427) LexToken(VAR,'spath',1,1444) LexToken(OPENBRACKET,'(',1,1449) LexToken(LASTINDEX,'$',1,1450) -LexToken(OPERATOR,'+',1,1451) +LexToken(ADDITION,'+',1,1451) LexToken(NUMBER,'1',1,1452) LexToken(CLOSEBRACKET,')',1,1453) LexToken(ASSIGNMENT,'=',1,1454) @@ -189,7 +189,7 @@ LexToken(EOL,'\n',1,1461) LexToken(VAR,'spath',1,1478) LexToken(OPENBRACKET,'(',1,1483) LexToken(LASTINDEX,'$',1,1484) -LexToken(OPERATOR,'+',1,1485) +LexToken(ADDITION,'+',1,1485) LexToken(NUMBER,'1',1,1486) LexToken(CLOSEBRACKET,')',1,1487) LexToken(ASSIGNMENT,'=',1,1488) @@ -210,11 +210,11 @@ LexToken(EOL,'\n',1,1555) LexToken(VAR,'execstr',1,1568) LexToken(OPENBRACKET,'(',1,1575) LexToken(DQSTRING,'"xxn="',1,1581) -LexToken(OPERATOR,'+',1,1582) +LexToken(ADDITION,'+',1,1582) LexToken(VAR,'xx',1,1583) LexToken(DOT,'.',1,1585) LexToken(VAR,'gui',1,1586) -LexToken(OPERATOR,'+',1,1589) +LexToken(ADDITION,'+',1,1589) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1603) LexToken(CLOSEBRACKET,')',1,1604) LexToken(EOL,'\n',1,1605) @@ -598,7 +598,7 @@ LexToken(VAR,'size',1,4061) LexToken(OPENBRACKET,'(',1,4065) LexToken(VAR,'newpar',1,4066) LexToken(CLOSEBRACKET,')',1,4072) -LexToken(OPERATOR,'+',1,4073) +LexToken(ADDITION,'+',1,4073) LexToken(NUMBER,'1',1,4074) LexToken(CLOSEBRACKET,')',1,4075) LexToken(ASSIGNMENT,'=',1,4076) @@ -938,8 +938,10 @@ LexToken(ASSIGNMENT,'=',1,5324) LexToken(OPENSQBRACKET,'[',1,5326) LexToken(NUMBER,'0',1,5327) LexToken(NUMBER,'20',1,5329) -LexToken(NUMBER,'-20',1,5333) -LexToken(NUMBER,'-20',1,5337) +LexToken(ADDITION,'-',1,5333) +LexToken(NUMBER,'20',1,5334) +LexToken(ADDITION,'-',1,5337) +LexToken(NUMBER,'20',1,5338) LexToken(NUMBER,'20',1,5341) LexToken(NUMBER,'1',1,5344) LexToken(CLOSESQBRACKET,']',1,5345) @@ -951,8 +953,10 @@ LexToken(VAR,'yy',1,5360) LexToken(ASSIGNMENT,'=',1,5363) LexToken(OPENSQBRACKET,'[',1,5365) LexToken(NUMBER,'0',1,5366) -LexToken(NUMBER,'-20',1,5368) -LexToken(NUMBER,'-20',1,5372) +LexToken(ADDITION,'-',1,5368) +LexToken(NUMBER,'20',1,5369) +LexToken(ADDITION,'-',1,5372) +LexToken(NUMBER,'20',1,5373) LexToken(NUMBER,'60',1,5377) LexToken(NUMBER,'60',1,5380) LexToken(NUMBER,'1',1,5383) @@ -966,7 +970,8 @@ LexToken(VAR,'ct',1,5400) LexToken(ASSIGNMENT,'=',1,5403) LexToken(OPENSQBRACKET,'[',1,5405) LexToken(NUMBER,'5',1,5406) -LexToken(NUMBER,'-1',1,5408) +LexToken(ADDITION,'-',1,5408) +LexToken(NUMBER,'1',1,5409) LexToken(CLOSESQBRACKET,']',1,5410) LexToken(SEMICOLON,';',1,5411) LexToken(EOL,'\n',1,5412) diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 2207710a..aa914278 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -229,7 +229,8 @@ LexToken(VAR,'model',1,1830) LexToken(DOT,'.',1,1835) LexToken(VAR,'firing',1,1836) LexToken(ASSIGNMENT,'=',1,1842) -LexToken(NUMBER,'-1',1,1843) +LexToken(ADDITION,'-',1,1843) +LexToken(NUMBER,'1',1,1844) LexToken(EOL,'\n',1,1860) LexToken(EOL,'\n',1,1928) LexToken(EOL,'\n',1,1966) @@ -310,7 +311,8 @@ LexToken(VAR,'model',1,2484) LexToken(DOT,'.',1,2489) LexToken(VAR,'firing',1,2490) LexToken(ASSIGNMENT,'=',1,2496) -LexToken(NUMBER,'-1',1,2497) +LexToken(ADDITION,'-',1,2497) +LexToken(NUMBER,'1',1,2498) LexToken(EOL,'\n',1,2499) LexToken(VAR,'model',1,2508) LexToken(DOT,'.',1,2513) diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index 74c89532..df7f3585 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -178,7 +178,7 @@ LexToken(EOL,'\n',1,1450) LexToken(VAR,'spath',1,1467) LexToken(OPENBRACKET,'(',1,1472) LexToken(LASTINDEX,'$',1,1473) -LexToken(OPERATOR,'+',1,1474) +LexToken(ADDITION,'+',1,1474) LexToken(NUMBER,'1',1,1475) LexToken(CLOSEBRACKET,')',1,1476) LexToken(ASSIGNMENT,'=',1,1477) @@ -187,7 +187,7 @@ LexToken(EOL,'\n',1,1485) LexToken(VAR,'spath',1,1502) LexToken(OPENBRACKET,'(',1,1507) LexToken(LASTINDEX,'$',1,1508) -LexToken(OPERATOR,'+',1,1509) +LexToken(ADDITION,'+',1,1509) LexToken(NUMBER,'1',1,1510) LexToken(CLOSEBRACKET,')',1,1511) LexToken(ASSIGNMENT,'=',1,1512) @@ -196,7 +196,7 @@ LexToken(EOL,'\n',1,1519) LexToken(VAR,'spath',1,1536) LexToken(OPENBRACKET,'(',1,1541) LexToken(LASTINDEX,'$',1,1542) -LexToken(OPERATOR,'+',1,1543) +LexToken(ADDITION,'+',1,1543) LexToken(NUMBER,'1',1,1544) LexToken(CLOSEBRACKET,')',1,1545) LexToken(ASSIGNMENT,'=',1,1546) @@ -205,7 +205,7 @@ LexToken(EOL,'\n',1,1553) LexToken(VAR,'spath',1,1570) LexToken(OPENBRACKET,'(',1,1575) LexToken(LASTINDEX,'$',1,1576) -LexToken(OPERATOR,'+',1,1577) +LexToken(ADDITION,'+',1,1577) LexToken(NUMBER,'1',1,1578) LexToken(CLOSEBRACKET,')',1,1579) LexToken(ASSIGNMENT,'=',1,1580) @@ -226,11 +226,11 @@ LexToken(EOL,'\n',1,1648) LexToken(VAR,'execstr',1,1661) LexToken(OPENBRACKET,'(',1,1668) LexToken(DQSTRING,'"xxn="',1,1674) -LexToken(OPERATOR,'+',1,1675) +LexToken(ADDITION,'+',1,1675) LexToken(VAR,'xx',1,1676) LexToken(DOT,'.',1,1678) LexToken(VAR,'gui',1,1679) -LexToken(OPERATOR,'+',1,1682) +LexToken(ADDITION,'+',1,1682) LexToken(DQSTRING,'"(\\\'set\\\',xx)"',1,1696) LexToken(CLOSEBRACKET,')',1,1697) LexToken(EOL,'\n',1,1698) @@ -723,7 +723,7 @@ LexToken(VAR,'size',1,4277) LexToken(OPENBRACKET,'(',1,4281) LexToken(VAR,'newpar',1,4282) LexToken(CLOSEBRACKET,')',1,4288) -LexToken(OPERATOR,'+',1,4289) +LexToken(ADDITION,'+',1,4289) LexToken(NUMBER,'1',1,4290) LexToken(CLOSEBRACKET,')',1,4291) LexToken(ASSIGNMENT,'=',1,4292) @@ -800,7 +800,8 @@ LexToken(NUMBER,'0.000001',1,4634) LexToken(SEMICOLON,';',1,4642) LexToken(NUMBER,'1.000',1,4643) LexToken(VAR,'D',1,4648) -LexToken(NUMBER,'-10',1,4649) +LexToken(ADDITION,'-',1,4649) +LexToken(NUMBER,'10',1,4650) LexToken(SEMICOLON,';',1,4652) LexToken(NUMBER,'100001',1,4653) LexToken(SEMICOLON,';',1,4659) @@ -1071,7 +1072,8 @@ LexToken(NUMBER,'10',1,5650) LexToken(SEMICOLON,';',1,5652) LexToken(NUMBER,'20',1,5653) LexToken(SEMICOLON,';',1,5655) -LexToken(NUMBER,'-30',1,5656) +LexToken(ADDITION,'-',1,5656) +LexToken(NUMBER,'30',1,5657) LexToken(CLOSESQBRACKET,']',1,5659) LexToken(COMMA,',',1,5660) LexToken(VAR,'ipar',1,5672) @@ -1174,7 +1176,8 @@ LexToken(ASSIGNMENT,'=',1,6060) LexToken(OPENSQBRACKET,'[',1,6061) LexToken(NUMBER,'5',1,6062) LexToken(COMMA,',',1,6063) -LexToken(NUMBER,'-1',1,6064) +LexToken(ADDITION,'-',1,6064) +LexToken(NUMBER,'1',1,6065) LexToken(CLOSESQBRACKET,']',1,6066) LexToken(COMMA,',',1,6067) LexToken(VAR,'from',1,6079) @@ -1476,7 +1479,8 @@ LexToken(ASSIGNMENT,'=',1,7312) LexToken(OPENSQBRACKET,'[',1,7313) LexToken(NUMBER,'5',1,7314) LexToken(COMMA,',',1,7315) -LexToken(NUMBER,'-1',1,7316) +LexToken(ADDITION,'-',1,7316) +LexToken(NUMBER,'1',1,7317) LexToken(CLOSESQBRACKET,']',1,7318) LexToken(COMMA,',',1,7319) LexToken(VAR,'from',1,7331) @@ -1593,15 +1597,18 @@ LexToken(DQSTRING,'"output"',1,7800) LexToken(COMMA,',',1,7801) LexToken(VAR,'in',1,7813) LexToken(ASSIGNMENT,'=',1,7815) -LexToken(NUMBER,'-1',1,7816) +LexToken(ADDITION,'-',1,7816) +LexToken(NUMBER,'1',1,7817) LexToken(COMMA,',',1,7818) LexToken(VAR,'in2',1,7830) LexToken(ASSIGNMENT,'=',1,7833) -LexToken(NUMBER,'-2',1,7834) +LexToken(ADDITION,'-',1,7834) +LexToken(NUMBER,'2',1,7835) LexToken(COMMA,',',1,7836) LexToken(VAR,'intyp',1,7848) LexToken(ASSIGNMENT,'=',1,7853) -LexToken(NUMBER,'-1',1,7854) +LexToken(ADDITION,'-',1,7854) +LexToken(NUMBER,'1',1,7855) LexToken(COMMA,',',1,7856) LexToken(VAR,'out',1,7868) LexToken(ASSIGNMENT,'=',1,7871) @@ -2012,7 +2019,8 @@ LexToken(ASSIGNMENT,'=',1,9558) LexToken(OPENSQBRACKET,'[',1,9559) LexToken(NUMBER,'5',1,9560) LexToken(COMMA,',',1,9561) -LexToken(NUMBER,'-1',1,9562) +LexToken(ADDITION,'-',1,9562) +LexToken(NUMBER,'1',1,9563) LexToken(CLOSESQBRACKET,']',1,9564) LexToken(COMMA,',',1,9565) LexToken(VAR,'from',1,9577) @@ -2060,7 +2068,8 @@ LexToken(NUMBER,'1',1,9716) LexToken(COMMA,',',1,9717) LexToken(VAR,'out',1,9729) LexToken(ASSIGNMENT,'=',1,9732) -LexToken(NUMBER,'-1',1,9733) +LexToken(ADDITION,'-',1,9733) +LexToken(NUMBER,'1',1,9734) LexToken(COMMA,',',1,9735) LexToken(VAR,'out2',1,9747) LexToken(ASSIGNMENT,'=',1,9751) @@ -2252,7 +2261,8 @@ LexToken(ASSIGNMENT,'=',1,10426) LexToken(NUMBER,'1',1,10427) LexToken(COLON,':',1,10428) LexToken(VAR,'N',1,10429) -LexToken(NUMBER,'-1',1,10430) +LexToken(ADDITION,'-',1,10430) +LexToken(NUMBER,'1',1,10431) LexToken(EOL,'\n',1,10432) LexToken(VAR,'X',1,10445) LexToken(ASSIGNMENT,'=',1,10446) @@ -2267,14 +2277,14 @@ LexToken(SEMICOLON,';',1,10454) LexToken(VAR,'x',1,10455) LexToken(OPENBRACKET,'(',1,10456) LexToken(VAR,'i',1,10457) -LexToken(OPERATOR,'+',1,10458) +LexToken(ADDITION,'+',1,10458) LexToken(NUMBER,'1',1,10459) LexToken(CLOSEBRACKET,')',1,10460) LexToken(SEMICOLON,';',1,10461) LexToken(VAR,'x',1,10462) LexToken(OPENBRACKET,'(',1,10463) LexToken(VAR,'i',1,10464) -LexToken(OPERATOR,'+',1,10465) +LexToken(ADDITION,'+',1,10465) LexToken(NUMBER,'1',1,10466) LexToken(CLOSEBRACKET,')',1,10467) LexToken(CLOSESQBRACKET,']',1,10468) @@ -2298,7 +2308,7 @@ LexToken(SEMICOLON,';',1,10497) LexToken(VAR,'y',1,10498) LexToken(OPENBRACKET,'(',1,10499) LexToken(VAR,'i',1,10500) -LexToken(OPERATOR,'+',1,10501) +LexToken(ADDITION,'+',1,10501) LexToken(NUMBER,'1',1,10502) LexToken(CLOSEBRACKET,')',1,10503) LexToken(CLOSESQBRACKET,']',1,10504) @@ -2429,7 +2439,8 @@ LexToken(ASSIGNMENT,'=',1,11020) LexToken(NUMBER,'1',1,11021) LexToken(COLON,':',1,11022) LexToken(VAR,'N',1,11023) -LexToken(NUMBER,'-1',1,11024) +LexToken(ADDITION,'-',1,11024) +LexToken(NUMBER,'1',1,11025) LexToken(EOL,'\n',1,11026) LexToken(VAR,'X',1,11035) LexToken(ASSIGNMENT,'=',1,11036) @@ -2446,12 +2457,12 @@ LexToken(COMMA,',',1,11053) LexToken(VAR,'x',1,11054) LexToken(OPENBRACKET,'(',1,11055) LexToken(VAR,'i',1,11056) -LexToken(OPERATOR,'+',1,11057) +LexToken(ADDITION,'+',1,11057) LexToken(NUMBER,'1',1,11058) LexToken(CLOSEBRACKET,')',1,11059) LexToken(COMMA,',',1,11060) LexToken(VAR,'NP',1,11061) -LexToken(OPERATOR,'+',1,11063) +LexToken(ADDITION,'+',1,11063) LexToken(NUMBER,'2',1,11064) LexToken(CLOSEBRACKET,')',1,11065) LexToken(TRANSPOSE,"'",1,11066) @@ -2492,7 +2503,8 @@ LexToken(OPENBRACKET,'(',1,11246) LexToken(NUMBER,'1',1,11247) LexToken(COLON,':',1,11248) LexToken(VAR,'N',1,11249) -LexToken(NUMBER,'-1',1,11250) +LexToken(ADDITION,'-',1,11250) +LexToken(NUMBER,'1',1,11251) LexToken(CLOSEBRACKET,')',1,11252) LexToken(SEMICOLON,';',1,11253) LexToken(EOL,'\n',1,11254) @@ -2503,9 +2515,10 @@ LexToken(OPENBRACKET,'(',1,11266) LexToken(VAR,'N',1,11267) LexToken(COLON,':',1,11268) LexToken(NUMBER,'2',1,11269) -LexToken(OPERATOR,'*',1,11270) +LexToken(MULTIPLICATION,'*',1,11270) LexToken(VAR,'N',1,11271) -LexToken(NUMBER,'-2',1,11272) +LexToken(ADDITION,'-',1,11272) +LexToken(NUMBER,'2',1,11273) LexToken(CLOSEBRACKET,')',1,11274) LexToken(SEMICOLON,';',1,11275) LexToken(EOL,'\n',1,11276) @@ -2514,14 +2527,16 @@ LexToken(ASSIGNMENT,'=',1,11286) LexToken(VAR,'Z',1,11287) LexToken(OPENBRACKET,'(',1,11288) LexToken(NUMBER,'2',1,11289) -LexToken(OPERATOR,'*',1,11290) +LexToken(MULTIPLICATION,'*',1,11290) LexToken(VAR,'N',1,11291) -LexToken(NUMBER,'-1',1,11292) +LexToken(ADDITION,'-',1,11292) +LexToken(NUMBER,'1',1,11293) LexToken(COLON,':',1,11294) LexToken(NUMBER,'3',1,11295) -LexToken(OPERATOR,'*',1,11296) +LexToken(MULTIPLICATION,'*',1,11296) LexToken(VAR,'N',1,11297) -LexToken(NUMBER,'-3',1,11298) +LexToken(ADDITION,'-',1,11298) +LexToken(NUMBER,'3',1,11299) LexToken(CLOSEBRACKET,')',1,11300) LexToken(SEMICOLON,';',1,11301) LexToken(EOL,'\n',1,11302) @@ -2542,9 +2557,11 @@ LexToken(FOR,'for',1,11344) LexToken(VAR,'i',1,11348) LexToken(ASSIGNMENT,'=',1,11349) LexToken(VAR,'N',1,11350) -LexToken(NUMBER,'-1',1,11351) +LexToken(ADDITION,'-',1,11351) +LexToken(NUMBER,'1',1,11352) LexToken(COLON,':',1,11353) -LexToken(NUMBER,'-1',1,11354) +LexToken(ADDITION,'-',1,11354) +LexToken(NUMBER,'1',1,11355) LexToken(COLON,':',1,11356) LexToken(NUMBER,'1',1,11357) LexToken(EOL,'\n',1,11358) @@ -2575,38 +2592,38 @@ LexToken(VAR,'A',1,11437) LexToken(OPENBRACKET,'(',1,11438) LexToken(VAR,'i',1,11439) LexToken(CLOSEBRACKET,')',1,11440) -LexToken(OPERATOR,'*',1,11441) +LexToken(MULTIPLICATION,'*',1,11441) LexToken(OPENBRACKET,'(',1,11442) LexToken(VAR,'X',1,11443) LexToken(OPENBRACKET,'(',1,11444) LexToken(VAR,'j',1,11445) LexToken(CLOSEBRACKET,')',1,11446) -LexToken(OPERATOR,'-',1,11447) +LexToken(ADDITION,'-',1,11447) LexToken(VAR,'x',1,11448) LexToken(OPENBRACKET,'(',1,11449) LexToken(VAR,'i',1,11450) LexToken(CLOSEBRACKET,')',1,11451) LexToken(CLOSEBRACKET,')',1,11452) -LexToken(OPERATOR,'^',1,11453) +LexToken(MULTIPLICATION,'^',1,11453) LexToken(NUMBER,'2',1,11454) -LexToken(OPERATOR,'+',1,11455) +LexToken(ADDITION,'+',1,11455) LexToken(VAR,'B',1,11456) LexToken(OPENBRACKET,'(',1,11457) LexToken(VAR,'i',1,11458) LexToken(CLOSEBRACKET,')',1,11459) -LexToken(OPERATOR,'*',1,11460) +LexToken(MULTIPLICATION,'*',1,11460) LexToken(OPENBRACKET,'(',1,11461) LexToken(VAR,'X',1,11462) LexToken(OPENBRACKET,'(',1,11463) LexToken(VAR,'j',1,11464) LexToken(CLOSEBRACKET,')',1,11465) -LexToken(OPERATOR,'-',1,11466) +LexToken(ADDITION,'-',1,11466) LexToken(VAR,'x',1,11467) LexToken(OPENBRACKET,'(',1,11468) LexToken(VAR,'i',1,11469) LexToken(CLOSEBRACKET,')',1,11470) LexToken(CLOSEBRACKET,')',1,11471) -LexToken(OPERATOR,'+',1,11472) +LexToken(ADDITION,'+',1,11472) LexToken(VAR,'C',1,11473) LexToken(OPENBRACKET,'(',1,11474) LexToken(VAR,'i',1,11475) @@ -2621,7 +2638,8 @@ LexToken(VAR,'matrix',1,11505) LexToken(OPENBRACKET,'(',1,11511) LexToken(VAR,'Z',1,11512) LexToken(COMMA,',',1,11513) -LexToken(NUMBER,'-1',1,11514) +LexToken(ADDITION,'-',1,11514) +LexToken(NUMBER,'1',1,11515) LexToken(COMMA,',',1,11516) LexToken(NUMBER,'1',1,11517) LexToken(CLOSEBRACKET,')',1,11518) @@ -2678,7 +2696,7 @@ LexToken(EOL,'\n',1,11732) LexToken(VAR,'xinfo',1,11745) LexToken(OPENBRACKET,'(',1,11750) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,11769) -LexToken(OPERATOR,'+',1,11770) +LexToken(ADDITION,'+',1,11770) LexToken(VAR,'METHOD',1,11771) LexToken(CLOSEBRACKET,')',1,11777) LexToken(EOL,'\n',1,11778) @@ -2761,7 +2779,7 @@ LexToken(EOL,'\n',1,12062) LexToken(VAR,'xinfo',1,12075) LexToken(OPENBRACKET,'(',1,12080) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12099) -LexToken(OPERATOR,'+',1,12100) +LexToken(ADDITION,'+',1,12100) LexToken(VAR,'METHOD',1,12101) LexToken(CLOSEBRACKET,')',1,12107) LexToken(EOL,'\n',1,12108) @@ -2819,7 +2837,7 @@ LexToken(EOL,'\n',1,12332) LexToken(VAR,'xinfo',1,12345) LexToken(OPENBRACKET,'(',1,12350) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12369) -LexToken(OPERATOR,'+',1,12370) +LexToken(ADDITION,'+',1,12370) LexToken(VAR,'METHOD',1,12371) LexToken(CLOSEBRACKET,')',1,12377) LexToken(EOL,'\n',1,12378) @@ -2878,7 +2896,7 @@ LexToken(EOL,'\n',1,12598) LexToken(VAR,'xinfo',1,12611) LexToken(OPENBRACKET,'(',1,12616) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12636) -LexToken(OPERATOR,'+',1,12637) +LexToken(ADDITION,'+',1,12637) LexToken(VAR,'METHOD',1,12638) LexToken(CLOSEBRACKET,')',1,12644) LexToken(EOL,'\n',1,12645) @@ -2942,7 +2960,7 @@ LexToken(EOL,'\n',1,12873) LexToken(VAR,'xinfo',1,12886) LexToken(OPENBRACKET,'(',1,12891) LexToken(DQSTRING,'"ERROR in SPLINE: "',1,12910) -LexToken(OPERATOR,'+',1,12911) +LexToken(ADDITION,'+',1,12911) LexToken(VAR,'METHOD',1,12912) LexToken(CLOSEBRACKET,')',1,12918) LexToken(EOL,'\n',1,12919) @@ -3055,7 +3073,8 @@ LexToken(VAR,'x',1,13338) LexToken(COMMA,',',1,13339) LexToken(DQSTRING,'"*"',1,13342) LexToken(CLOSEBRACKET,')',1,13343) -LexToken(NUMBER,'-1',1,13344) +LexToken(ADDITION,'-',1,13344) +LexToken(NUMBER,'1',1,13345) LexToken(SEMICOLON,';',1,13346) LexToken(EOL,'\n',1,13347) LexToken(VAR,'A',1,13352) @@ -3063,12 +3082,13 @@ LexToken(ASSIGNMENT,'=',1,13353) LexToken(VAR,'zeros',1,13354) LexToken(OPENBRACKET,'(',1,13359) LexToken(NUMBER,'3',1,13360) -LexToken(OPERATOR,'*',1,13361) +LexToken(MULTIPLICATION,'*',1,13361) LexToken(VAR,'N',1,13362) -LexToken(NUMBER,'-1',1,13363) +LexToken(ADDITION,'-',1,13363) +LexToken(NUMBER,'1',1,13364) LexToken(COMMA,',',1,13365) LexToken(VAR,'N',1,13366) -LexToken(OPERATOR,'*',1,13367) +LexToken(MULTIPLICATION,'*',1,13367) LexToken(NUMBER,'3',1,13368) LexToken(CLOSEBRACKET,')',1,13369) LexToken(SEMICOLON,';',1,13370) @@ -3078,9 +3098,10 @@ LexToken(ASSIGNMENT,'=',1,13377) LexToken(VAR,'zeros',1,13378) LexToken(OPENBRACKET,'(',1,13383) LexToken(NUMBER,'3',1,13384) -LexToken(OPERATOR,'*',1,13385) +LexToken(MULTIPLICATION,'*',1,13385) LexToken(VAR,'N',1,13386) -LexToken(NUMBER,'-1',1,13387) +LexToken(ADDITION,'-',1,13387) +LexToken(NUMBER,'1',1,13388) LexToken(COMMA,',',1,13389) LexToken(NUMBER,'1',1,13390) LexToken(CLOSEBRACKET,')',1,13391) @@ -3096,12 +3117,13 @@ LexToken(EOL,'\n',1,13407) LexToken(VAR,'j',1,13416) LexToken(ASSIGNMENT,'=',1,13417) LexToken(NUMBER,'3',1,13418) -LexToken(OPERATOR,'*',1,13419) +LexToken(MULTIPLICATION,'*',1,13419) LexToken(OPENBRACKET,'(',1,13420) LexToken(VAR,'i',1,13421) -LexToken(NUMBER,'-1',1,13422) +LexToken(ADDITION,'-',1,13422) +LexToken(NUMBER,'1',1,13423) LexToken(CLOSEBRACKET,')',1,13424) -LexToken(OPERATOR,'+',1,13425) +LexToken(ADDITION,'+',1,13425) LexToken(NUMBER,'1',1,13426) LexToken(SEMICOLON,';',1,13427) LexToken(EOL,'\n',1,13428) @@ -3110,9 +3132,9 @@ LexToken(OPENBRACKET,'(',1,13438) LexToken(VAR,'j',1,13439) LexToken(COMMA,',',1,13440) LexToken(VAR,'i',1,13441) -LexToken(OPERATOR,'+',1,13442) +LexToken(ADDITION,'+',1,13442) LexToken(NUMBER,'2',1,13443) -LexToken(OPERATOR,'*',1,13444) +LexToken(MULTIPLICATION,'*',1,13444) LexToken(VAR,'N',1,13445) LexToken(CLOSEBRACKET,')',1,13446) LexToken(ASSIGNMENT,'=',1,13447) @@ -3133,7 +3155,7 @@ LexToken(EOL,'\n',1,13469) LexToken(VAR,'A',1,13478) LexToken(OPENBRACKET,'(',1,13479) LexToken(VAR,'j',1,13480) -LexToken(OPERATOR,'+',1,13481) +LexToken(ADDITION,'+',1,13481) LexToken(NUMBER,'1',1,13482) LexToken(COMMA,',',1,13483) LexToken(VAR,'i',1,13484) @@ -3143,37 +3165,37 @@ LexToken(OPENBRACKET,'(',1,13487) LexToken(VAR,'x',1,13488) LexToken(OPENBRACKET,'(',1,13489) LexToken(VAR,'i',1,13490) -LexToken(OPERATOR,'+',1,13491) +LexToken(ADDITION,'+',1,13491) LexToken(NUMBER,'1',1,13492) LexToken(CLOSEBRACKET,')',1,13493) -LexToken(OPERATOR,'-',1,13494) +LexToken(ADDITION,'-',1,13494) LexToken(VAR,'x',1,13495) LexToken(OPENBRACKET,'(',1,13496) LexToken(VAR,'i',1,13497) LexToken(CLOSEBRACKET,')',1,13498) LexToken(CLOSEBRACKET,')',1,13499) -LexToken(OPERATOR,'^',1,13500) +LexToken(MULTIPLICATION,'^',1,13500) LexToken(NUMBER,'2',1,13501) LexToken(SEMICOLON,';',1,13502) LexToken(EOL,'\n',1,13503) LexToken(VAR,'A',1,13512) LexToken(OPENBRACKET,'(',1,13513) LexToken(VAR,'j',1,13514) -LexToken(OPERATOR,'+',1,13515) +LexToken(ADDITION,'+',1,13515) LexToken(NUMBER,'1',1,13516) LexToken(COMMA,',',1,13517) LexToken(VAR,'i',1,13518) -LexToken(OPERATOR,'+',1,13519) +LexToken(ADDITION,'+',1,13519) LexToken(VAR,'N',1,13520) LexToken(CLOSEBRACKET,')',1,13521) LexToken(ASSIGNMENT,'=',1,13522) LexToken(VAR,'x',1,13523) LexToken(OPENBRACKET,'(',1,13524) LexToken(VAR,'i',1,13525) -LexToken(OPERATOR,'+',1,13526) +LexToken(ADDITION,'+',1,13526) LexToken(NUMBER,'1',1,13527) LexToken(CLOSEBRACKET,')',1,13528) -LexToken(OPERATOR,'-',1,13529) +LexToken(ADDITION,'-',1,13529) LexToken(VAR,'x',1,13530) LexToken(OPENBRACKET,'(',1,13531) LexToken(VAR,'i',1,13532) @@ -3183,13 +3205,13 @@ LexToken(EOL,'\n',1,13535) LexToken(VAR,'A',1,13544) LexToken(OPENBRACKET,'(',1,13545) LexToken(VAR,'j',1,13546) -LexToken(OPERATOR,'+',1,13547) +LexToken(ADDITION,'+',1,13547) LexToken(NUMBER,'1',1,13548) LexToken(COMMA,',',1,13549) LexToken(VAR,'i',1,13550) -LexToken(OPERATOR,'+',1,13551) +LexToken(ADDITION,'+',1,13551) LexToken(NUMBER,'2',1,13552) -LexToken(OPERATOR,'*',1,13553) +LexToken(MULTIPLICATION,'*',1,13553) LexToken(VAR,'N',1,13554) LexToken(CLOSEBRACKET,')',1,13555) LexToken(ASSIGNMENT,'=',1,13556) @@ -3199,14 +3221,14 @@ LexToken(EOL,'\n',1,13559) LexToken(VAR,'B',1,13568) LexToken(OPENBRACKET,'(',1,13569) LexToken(VAR,'j',1,13570) -LexToken(OPERATOR,'+',1,13571) +LexToken(ADDITION,'+',1,13571) LexToken(NUMBER,'1',1,13572) LexToken(CLOSEBRACKET,')',1,13573) LexToken(ASSIGNMENT,'=',1,13574) LexToken(VAR,'y',1,13575) LexToken(OPENBRACKET,'(',1,13576) LexToken(VAR,'i',1,13577) -LexToken(OPERATOR,'+',1,13578) +LexToken(ADDITION,'+',1,13578) LexToken(NUMBER,'1',1,13579) LexToken(CLOSEBRACKET,')',1,13580) LexToken(SEMICOLON,';',1,13581) @@ -3220,39 +3242,41 @@ LexToken(ASSIGNMENT,'=',1,13601) LexToken(NUMBER,'1',1,13602) LexToken(COLON,':',1,13603) LexToken(VAR,'N',1,13604) -LexToken(NUMBER,'-1',1,13605) +LexToken(ADDITION,'-',1,13605) +LexToken(NUMBER,'1',1,13606) LexToken(EOL,'\n',1,13607) LexToken(VAR,'j',1,13616) LexToken(ASSIGNMENT,'=',1,13617) LexToken(NUMBER,'3',1,13618) -LexToken(OPERATOR,'*',1,13619) +LexToken(MULTIPLICATION,'*',1,13619) LexToken(OPENBRACKET,'(',1,13620) LexToken(VAR,'i',1,13621) -LexToken(NUMBER,'-1',1,13622) +LexToken(ADDITION,'-',1,13622) +LexToken(NUMBER,'1',1,13623) LexToken(CLOSEBRACKET,')',1,13624) -LexToken(OPERATOR,'+',1,13625) +LexToken(ADDITION,'+',1,13625) LexToken(NUMBER,'1',1,13626) LexToken(SEMICOLON,';',1,13627) LexToken(EOL,'\n',1,13628) LexToken(VAR,'A',1,13637) LexToken(OPENBRACKET,'(',1,13638) LexToken(VAR,'j',1,13639) -LexToken(OPERATOR,'+',1,13640) +LexToken(ADDITION,'+',1,13640) LexToken(NUMBER,'2',1,13641) LexToken(COMMA,',',1,13642) LexToken(VAR,'i',1,13643) LexToken(CLOSEBRACKET,')',1,13644) LexToken(ASSIGNMENT,'=',1,13645) LexToken(NUMBER,'2',1,13646) -LexToken(OPERATOR,'*',1,13647) +LexToken(MULTIPLICATION,'*',1,13647) LexToken(OPENBRACKET,'(',1,13648) LexToken(VAR,'x',1,13649) LexToken(OPENBRACKET,'(',1,13650) LexToken(VAR,'i',1,13651) -LexToken(OPERATOR,'+',1,13652) +LexToken(ADDITION,'+',1,13652) LexToken(NUMBER,'1',1,13653) LexToken(CLOSEBRACKET,')',1,13654) -LexToken(OPERATOR,'-',1,13655) +LexToken(ADDITION,'-',1,13655) LexToken(VAR,'x',1,13656) LexToken(OPENBRACKET,'(',1,13657) LexToken(VAR,'i',1,13658) @@ -3263,11 +3287,11 @@ LexToken(EOL,'\n',1,13662) LexToken(VAR,'A',1,13671) LexToken(OPENBRACKET,'(',1,13672) LexToken(VAR,'j',1,13673) -LexToken(OPERATOR,'+',1,13674) +LexToken(ADDITION,'+',1,13674) LexToken(NUMBER,'2',1,13675) LexToken(COMMA,',',1,13676) LexToken(VAR,'i',1,13677) -LexToken(OPERATOR,'+',1,13678) +LexToken(ADDITION,'+',1,13678) LexToken(VAR,'N',1,13679) LexToken(CLOSEBRACKET,')',1,13680) LexToken(ASSIGNMENT,'=',1,13681) @@ -3277,17 +3301,18 @@ LexToken(EOL,'\n',1,13684) LexToken(VAR,'A',1,13693) LexToken(OPENBRACKET,'(',1,13694) LexToken(VAR,'j',1,13695) -LexToken(OPERATOR,'+',1,13696) +LexToken(ADDITION,'+',1,13696) LexToken(NUMBER,'2',1,13697) LexToken(COMMA,',',1,13698) LexToken(VAR,'i',1,13699) -LexToken(OPERATOR,'+',1,13700) +LexToken(ADDITION,'+',1,13700) LexToken(VAR,'N',1,13701) -LexToken(OPERATOR,'+',1,13702) +LexToken(ADDITION,'+',1,13702) LexToken(NUMBER,'1',1,13703) LexToken(CLOSEBRACKET,')',1,13704) LexToken(ASSIGNMENT,'=',1,13705) -LexToken(NUMBER,'-1',1,13706) +LexToken(ADDITION,'-',1,13706) +LexToken(NUMBER,'1',1,13707) LexToken(SEMICOLON,';',1,13708) LexToken(EOL,'\n',1,13709) LexToken(END,'end',1,13714) @@ -3298,11 +3323,11 @@ LexToken(ASSIGNMENT,'=',1,13724) LexToken(VAR,'zeros',1,13725) LexToken(OPENBRACKET,'(',1,13730) LexToken(NUMBER,'3',1,13731) -LexToken(OPERATOR,'*',1,13732) +LexToken(MULTIPLICATION,'*',1,13732) LexToken(VAR,'N',1,13733) LexToken(COMMA,',',1,13734) LexToken(NUMBER,'3',1,13735) -LexToken(OPERATOR,'*',1,13736) +LexToken(MULTIPLICATION,'*',1,13736) LexToken(VAR,'N',1,13737) LexToken(CLOSEBRACKET,')',1,13738) LexToken(SEMICOLON,';',1,13739) @@ -3322,21 +3347,21 @@ LexToken(VAR,'i',1,13767) LexToken(CLOSEBRACKET,')',1,13768) LexToken(ASSIGNMENT,'=',1,13769) LexToken(NUMBER,'4',1,13770) -LexToken(OPERATOR,'*',1,13771) +LexToken(MULTIPLICATION,'*',1,13771) LexToken(OPENBRACKET,'(',1,13772) LexToken(VAR,'x',1,13773) LexToken(OPENBRACKET,'(',1,13774) LexToken(VAR,'i',1,13775) -LexToken(OPERATOR,'+',1,13776) +LexToken(ADDITION,'+',1,13776) LexToken(NUMBER,'1',1,13777) LexToken(CLOSEBRACKET,')',1,13778) -LexToken(OPERATOR,'-',1,13779) +LexToken(ADDITION,'-',1,13779) LexToken(VAR,'x',1,13780) LexToken(OPENBRACKET,'(',1,13781) LexToken(VAR,'i',1,13782) LexToken(CLOSEBRACKET,')',1,13783) LexToken(CLOSEBRACKET,')',1,13784) -LexToken(OPERATOR,'^',1,13785) +LexToken(MULTIPLICATION,'^',1,13785) LexToken(NUMBER,'2',1,13786) LexToken(EOL,'\n',1,13787) LexToken(VAR,'Q',1,13796) @@ -3344,20 +3369,20 @@ LexToken(OPENBRACKET,'(',1,13797) LexToken(VAR,'i',1,13798) LexToken(COMMA,',',1,13799) LexToken(VAR,'i',1,13800) -LexToken(OPERATOR,'+',1,13801) +LexToken(ADDITION,'+',1,13801) LexToken(VAR,'N',1,13802) LexToken(CLOSEBRACKET,')',1,13803) LexToken(ASSIGNMENT,'=',1,13804) LexToken(NUMBER,'2',1,13805) -LexToken(OPERATOR,'*',1,13806) +LexToken(MULTIPLICATION,'*',1,13806) LexToken(OPENBRACKET,'(',1,13807) LexToken(VAR,'x',1,13808) LexToken(OPENBRACKET,'(',1,13809) LexToken(VAR,'i',1,13810) -LexToken(OPERATOR,'+',1,13811) +LexToken(ADDITION,'+',1,13811) LexToken(NUMBER,'1',1,13812) LexToken(CLOSEBRACKET,')',1,13813) -LexToken(OPERATOR,'-',1,13814) +LexToken(ADDITION,'-',1,13814) LexToken(VAR,'x',1,13815) LexToken(OPENBRACKET,'(',1,13816) LexToken(VAR,'i',1,13817) @@ -3367,22 +3392,22 @@ LexToken(EOL,'\n',1,13820) LexToken(VAR,'Q',1,13829) LexToken(OPENBRACKET,'(',1,13830) LexToken(VAR,'i',1,13831) -LexToken(OPERATOR,'+',1,13832) +LexToken(ADDITION,'+',1,13832) LexToken(VAR,'N',1,13833) LexToken(COMMA,',',1,13834) LexToken(VAR,'i',1,13835) LexToken(CLOSEBRACKET,')',1,13836) LexToken(ASSIGNMENT,'=',1,13837) LexToken(NUMBER,'2',1,13838) -LexToken(OPERATOR,'*',1,13839) +LexToken(MULTIPLICATION,'*',1,13839) LexToken(OPENBRACKET,'(',1,13840) LexToken(VAR,'x',1,13841) LexToken(OPENBRACKET,'(',1,13842) LexToken(VAR,'i',1,13843) -LexToken(OPERATOR,'+',1,13844) +LexToken(ADDITION,'+',1,13844) LexToken(NUMBER,'1',1,13845) LexToken(CLOSEBRACKET,')',1,13846) -LexToken(OPERATOR,'-',1,13847) +LexToken(ADDITION,'-',1,13847) LexToken(VAR,'x',1,13848) LexToken(OPENBRACKET,'(',1,13849) LexToken(VAR,'i',1,13850) @@ -3392,11 +3417,11 @@ LexToken(EOL,'\n',1,13853) LexToken(VAR,'Q',1,13862) LexToken(OPENBRACKET,'(',1,13863) LexToken(VAR,'i',1,13864) -LexToken(OPERATOR,'+',1,13865) +LexToken(ADDITION,'+',1,13865) LexToken(VAR,'N',1,13866) LexToken(COMMA,',',1,13867) LexToken(VAR,'i',1,13868) -LexToken(OPERATOR,'+',1,13869) +LexToken(ADDITION,'+',1,13869) LexToken(VAR,'N',1,13870) LexToken(CLOSEBRACKET,')',1,13871) LexToken(ASSIGNMENT,'=',1,13872) @@ -3419,14 +3444,16 @@ LexToken(COMMA,',',1,13899) LexToken(VAR,'zeros',1,13900) LexToken(OPENBRACKET,'(',1,13905) LexToken(NUMBER,'3',1,13906) -LexToken(OPERATOR,'*',1,13907) +LexToken(MULTIPLICATION,'*',1,13907) LexToken(VAR,'N',1,13908) -LexToken(NUMBER,'-1',1,13909) +LexToken(ADDITION,'-',1,13909) +LexToken(NUMBER,'1',1,13910) LexToken(COMMA,',',1,13911) LexToken(NUMBER,'3',1,13912) -LexToken(OPERATOR,'*',1,13913) +LexToken(MULTIPLICATION,'*',1,13913) LexToken(VAR,'N',1,13914) -LexToken(NUMBER,'-1',1,13915) +LexToken(ADDITION,'-',1,13915) +LexToken(NUMBER,'1',1,13916) LexToken(CLOSEBRACKET,')',1,13917) LexToken(CLOSESQBRACKET,']',1,13918) LexToken(EOL,'\n',1,13919) @@ -3436,7 +3463,7 @@ LexToken(OPENSQBRACKET,'[',1,13927) LexToken(VAR,'zeros',1,13928) LexToken(OPENBRACKET,'(',1,13933) LexToken(NUMBER,'3',1,13934) -LexToken(OPERATOR,'*',1,13935) +LexToken(MULTIPLICATION,'*',1,13935) LexToken(VAR,'N',1,13936) LexToken(COMMA,',',1,13937) LexToken(NUMBER,'1',1,13938) @@ -3448,7 +3475,7 @@ LexToken(EOL,'\n',1,13943) LexToken(VAR,'Zt',1,13948) LexToken(ASSIGNMENT,'=',1,13950) LexToken(VAR,'At',1,13951) -LexToken(OPERATOR,'\\',1,13953) +LexToken(MULTIPLICATION,'\\',1,13953) LexToken(VAR,'Bt',1,13954) LexToken(SEMICOLON,';',1,13956) LexToken(EOL,'\n',1,13957) @@ -3459,7 +3486,7 @@ LexToken(OPENBRACKET,'(',1,13966) LexToken(NUMBER,'1',1,13967) LexToken(COLON,':',1,13968) LexToken(NUMBER,'3',1,13969) -LexToken(OPERATOR,'*',1,13970) +LexToken(MULTIPLICATION,'*',1,13970) LexToken(VAR,'N',1,13971) LexToken(COMMA,',',1,13972) LexToken(NUMBER,'1',1,13973) diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 3c627d1e..589c3c30 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -175,7 +175,8 @@ LexToken(THEN,'then',1,1537) LexToken(EOL,'\n',1,1541) LexToken(VAR,'a',1,1550) LexToken(ASSIGNMENT,'=',1,1551) -LexToken(NUMBER,'-10',1,1552) +LexToken(ADDITION,'-',1,1552) +LexToken(NUMBER,'10',1,1553) LexToken(SEMICOLON,';',1,1555) LexToken(EOL,'\n',1,1556) LexToken(VAR,'b',1,1565) diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index a629c0b4..ee148595 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -219,10 +219,10 @@ LexToken(COMMA,',',1,1592) LexToken(VAR,'nout',1,1593) LexToken(COMMA,',',1,1597) LexToken(NUMBER,'2',1,1598) -LexToken(OPERATOR,'^',1,1599) +LexToken(MULTIPLICATION,'^',1,1599) LexToken(OPENBRACKET,'(',1,1600) LexToken(NUMBER,'2',1,1601) -LexToken(OPERATOR,'*',1,1602) +LexToken(MULTIPLICATION,'*',1,1602) LexToken(VAR,'nin',1,1603) LexToken(CLOSEBRACKET,')',1,1606) LexToken(CLOSEBRACKET,')',1,1607) @@ -232,17 +232,18 @@ LexToken(ELSE,'else',1,1626) LexToken(EOL,'\n',1,1630) LexToken(VAR,'rp',1,1651) LexToken(ASSIGNMENT,'=',1,1653) -LexToken(NUMBER,'-1',1,1654) -LexToken(OPERATOR,'*',1,1656) +LexToken(ADDITION,'-',1,1654) +LexToken(NUMBER,'1',1,1655) +LexToken(MULTIPLICATION,'*',1,1656) LexToken(VAR,'ones',1,1657) LexToken(OPENBRACKET,'(',1,1661) LexToken(VAR,'nout1',1,1662) LexToken(COMMA,',',1,1667) LexToken(NUMBER,'2',1,1668) -LexToken(OPERATOR,'^',1,1669) +LexToken(MULTIPLICATION,'^',1,1669) LexToken(OPENBRACKET,'(',1,1670) LexToken(NUMBER,'2',1,1671) -LexToken(OPERATOR,'*',1,1672) +LexToken(MULTIPLICATION,'*',1,1672) LexToken(VAR,'nin1',1,1673) LexToken(CLOSEBRACKET,')',1,1677) LexToken(CLOSEBRACKET,')',1,1678) @@ -257,7 +258,7 @@ LexToken(VAR,'rp',1,1723) LexToken(COMMA,',',1,1725) LexToken(NUMBER,'2',1,1726) LexToken(CLOSEBRACKET,')',1,1727) -LexToken(OPERATOR,'/',1,1728) +LexToken(MULTIPLICATION,'/',1,1728) LexToken(NUMBER,'2',1,1729) LexToken(EOL,'\n',1,1730) LexToken(VAR,'result',1,1747) @@ -278,10 +279,10 @@ LexToken(OPENBRACKET,'(',1,1822) LexToken(NUMBER,'1',1,1823) LexToken(COLON,':',1,1824) LexToken(NUMBER,'2',1,1825) -LexToken(OPERATOR,'^',1,1826) +LexToken(MULTIPLICATION,'^',1,1826) LexToken(OPENBRACKET,'(',1,1827) LexToken(NUMBER,'2',1,1828) -LexToken(OPERATOR,'*',1,1829) +LexToken(MULTIPLICATION,'*',1,1829) LexToken(VAR,'nin1',1,1830) LexToken(CLOSEBRACKET,')',1,1834) LexToken(CLOSEBRACKET,')',1,1835) @@ -313,7 +314,7 @@ LexToken(COMMA,',',1,1919) LexToken(NUMBER,'1',1,1920) LexToken(COLON,':',1,1921) LexToken(NUMBER,'2',1,1922) -LexToken(OPERATOR,'*',1,1923) +LexToken(MULTIPLICATION,'*',1,1923) LexToken(VAR,'n',1,1924) LexToken(CLOSEBRACKET,')',1,1925) LexToken(ASSIGNMENT,'=',1,1926) @@ -341,7 +342,7 @@ LexToken(VAR,'model',1,2035) LexToken(DOT,'.',1,2040) LexToken(VAR,'firing',1,2041) LexToken(ASSIGNMENT,'=',1,2047) -LexToken(OPERATOR,'-',1,2048) +LexToken(ADDITION,'-',1,2048) LexToken(VAR,'ones',1,2049) LexToken(OPENBRACKET,'(',1,2053) LexToken(VAR,'out',1,2054) @@ -464,7 +465,7 @@ LexToken(VAR,'model',1,2507) LexToken(DOT,'.',1,2512) LexToken(VAR,'firing',1,2513) LexToken(ASSIGNMENT,'=',1,2519) -LexToken(OPERATOR,'-',1,2520) +LexToken(ADDITION,'-',1,2520) LexToken(VAR,'ones',1,2521) LexToken(OPENBRACKET,'(',1,2525) LexToken(VAR,'out',1,2526) diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index a4c7e20d..32c4bd20 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -73,7 +73,8 @@ LexToken(VAR,'model',1,971) LexToken(DOT,'.',1,976) LexToken(VAR,'firing',1,977) LexToken(ASSIGNMENT,'=',1,983) -LexToken(NUMBER,'-1',1,984) +LexToken(ADDITION,'-',1,984) +LexToken(NUMBER,'1',1,985) LexToken(EOL,'\n',1,1002) LexToken(CASE,'case',1,1007) LexToken(DQSTRING,'"define"',1,1019) @@ -119,13 +120,16 @@ LexToken(DOT,'.',1,1169) LexToken(VAR,'rpar',1,1170) LexToken(ASSIGNMENT,'=',1,1174) LexToken(OPENSQBRACKET,'[',1,1175) -LexToken(NUMBER,'-1',1,1176) +LexToken(ADDITION,'-',1,1176) +LexToken(NUMBER,'1',1,1177) LexToken(SEMICOLON,';',1,1178) -LexToken(NUMBER,'-1',1,1179) +LexToken(ADDITION,'-',1,1179) +LexToken(NUMBER,'1',1,1180) LexToken(SEMICOLON,';',1,1181) LexToken(NUMBER,'0',1,1182) LexToken(SEMICOLON,';',1,1183) -LexToken(NUMBER,'-1',1,1184) +LexToken(ADDITION,'-',1,1184) +LexToken(NUMBER,'1',1,1185) LexToken(CLOSESQBRACKET,']',1,1186) LexToken(EOL,'\n',1,1187) LexToken(VAR,'model',1,1196) @@ -138,7 +142,8 @@ LexToken(VAR,'model',1,1224) LexToken(DOT,'.',1,1229) LexToken(VAR,'firing',1,1230) LexToken(ASSIGNMENT,'=',1,1236) -LexToken(NUMBER,'-1',1,1237) +LexToken(ADDITION,'-',1,1237) +LexToken(NUMBER,'1',1,1238) LexToken(EOL,'\n',1,1239) LexToken(VAR,'model',1,1248) LexToken(DOT,'.',1,1253) diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index 9596ee57..5083b111 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -74,7 +74,8 @@ LexToken(DOT,'.',1,976) LexToken(VAR,'firing',1,977) LexToken(ASSIGNMENT,'=',1,983) LexToken(OPENSQBRACKET,'[',1,984) -LexToken(NUMBER,'-1',1,985) +LexToken(ADDITION,'-',1,985) +LexToken(NUMBER,'1',1,986) LexToken(CLOSESQBRACKET,']',1,987) LexToken(EOL,'\n',1,1004) LexToken(CASE,'case',1,1009) @@ -84,11 +85,14 @@ LexToken(EOL,'\n',1,1027) LexToken(VAR,'rpar',1,1036) LexToken(ASSIGNMENT,'=',1,1040) LexToken(OPENSQBRACKET,'[',1,1041) -LexToken(NUMBER,'-1',1,1042) +LexToken(ADDITION,'-',1,1042) +LexToken(NUMBER,'1',1,1043) LexToken(SEMICOLON,';',1,1044) -LexToken(NUMBER,'-1',1,1045) +LexToken(ADDITION,'-',1,1045) +LexToken(NUMBER,'1',1,1046) LexToken(SEMICOLON,';',1,1047) -LexToken(NUMBER,'-1',1,1048) +LexToken(ADDITION,'-',1,1048) +LexToken(NUMBER,'1',1,1049) LexToken(SEMICOLON,';',1,1050) LexToken(NUMBER,'0',1,1051) LexToken(CLOSESQBRACKET,']',1,1052) @@ -133,11 +137,14 @@ LexToken(DOT,'.',1,1197) LexToken(VAR,'rpar',1,1198) LexToken(ASSIGNMENT,'=',1,1202) LexToken(OPENSQBRACKET,'[',1,1203) -LexToken(NUMBER,'-1',1,1204) +LexToken(ADDITION,'-',1,1204) +LexToken(NUMBER,'1',1,1205) LexToken(SEMICOLON,';',1,1206) -LexToken(NUMBER,'-1',1,1207) +LexToken(ADDITION,'-',1,1207) +LexToken(NUMBER,'1',1,1208) LexToken(SEMICOLON,';',1,1209) -LexToken(NUMBER,'-1',1,1210) +LexToken(ADDITION,'-',1,1210) +LexToken(NUMBER,'1',1,1211) LexToken(SEMICOLON,';',1,1212) LexToken(NUMBER,'0',1,1213) LexToken(CLOSESQBRACKET,']',1,1214) @@ -162,7 +169,8 @@ LexToken(DOT,'.',1,1286) LexToken(VAR,'firing',1,1287) LexToken(ASSIGNMENT,'=',1,1293) LexToken(OPENSQBRACKET,'[',1,1294) -LexToken(NUMBER,'-1',1,1295) +LexToken(ADDITION,'-',1,1295) +LexToken(NUMBER,'1',1,1296) LexToken(CLOSESQBRACKET,']',1,1297) LexToken(EOL,'\n',1,1298) LexToken(VAR,'gr_i',1,1307) diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 1db29d05..8f9cce9d 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -163,14 +163,15 @@ LexToken(EOL,'\n',1,1479) LexToken(VAR,'kk',1,1500) LexToken(ASSIGNMENT,'=',1,1502) LexToken(VAR,'kk',1,1503) -LexToken(OPERATOR,'+',1,1505) +LexToken(ADDITION,'+',1,1505) LexToken(NUMBER,'2',1,1506) -LexToken(OPERATOR,'^',1,1507) +LexToken(MULTIPLICATION,'^',1,1507) LexToken(OPENBRACKET,'(',1,1508) LexToken(VAR,'in',1,1509) -LexToken(OPERATOR,'+',1,1511) +LexToken(ADDITION,'+',1,1511) LexToken(VAR,'jj',1,1512) -LexToken(NUMBER,'-1',1,1514) +LexToken(ADDITION,'-',1,1514) +LexToken(NUMBER,'1',1,1515) LexToken(CLOSEBRACKET,')',1,1516) LexToken(EOL,'\n',1,1517) LexToken(END,'end',1,1534) @@ -180,7 +181,7 @@ LexToken(DOT,'.',1,1559) LexToken(VAR,'rpar',1,1560) LexToken(ASSIGNMENT,'=',1,1564) LexToken(OPENSQBRACKET,'[',1,1565) -LexToken(OPERATOR,'-',1,1566) +LexToken(ADDITION,'-',1,1566) LexToken(VAR,'ones',1,1567) LexToken(OPENBRACKET,'(',1,1571) LexToken(VAR,'kk',1,1572) @@ -191,13 +192,13 @@ LexToken(SEMICOLON,';',1,1577) LexToken(VAR,'zeros',1,1578) LexToken(OPENBRACKET,'(',1,1583) LexToken(NUMBER,'2',1,1584) -LexToken(OPERATOR,'^',1,1585) +LexToken(MULTIPLICATION,'^',1,1585) LexToken(OPENBRACKET,'(',1,1586) LexToken(NUMBER,'2',1,1587) -LexToken(OPERATOR,'*',1,1588) +LexToken(MULTIPLICATION,'*',1,1588) LexToken(VAR,'in',1,1589) LexToken(CLOSEBRACKET,')',1,1591) -LexToken(OPERATOR,'-',1,1592) +LexToken(ADDITION,'-',1,1592) LexToken(VAR,'kk',1,1593) LexToken(COMMA,',',1,1595) LexToken(NUMBER,'1',1,1596) @@ -226,7 +227,8 @@ LexToken(VAR,'model',1,1714) LexToken(DOT,'.',1,1719) LexToken(VAR,'firing',1,1720) LexToken(ASSIGNMENT,'=',1,1726) -LexToken(NUMBER,'-1',1,1727) +LexToken(ADDITION,'-',1,1727) +LexToken(NUMBER,'1',1,1728) LexToken(EOL,'\n',1,1745) LexToken(VAR,'x',1,1762) LexToken(DOT,'.',1,1763) @@ -254,9 +256,11 @@ LexToken(EOL,'\n',1,1885) LexToken(VAR,'rpar',1,1894) LexToken(ASSIGNMENT,'=',1,1898) LexToken(OPENSQBRACKET,'[',1,1899) -LexToken(NUMBER,'-1',1,1900) +LexToken(ADDITION,'-',1,1900) +LexToken(NUMBER,'1',1,1901) LexToken(SEMICOLON,';',1,1902) -LexToken(NUMBER,'-1',1,1903) +LexToken(ADDITION,'-',1,1903) +LexToken(NUMBER,'1',1,1904) LexToken(SEMICOLON,';',1,1905) LexToken(NUMBER,'0',1,1906) LexToken(SEMICOLON,';',1,1907) @@ -308,9 +312,11 @@ LexToken(DOT,'.',1,2070) LexToken(VAR,'rpar',1,2071) LexToken(ASSIGNMENT,'=',1,2075) LexToken(OPENSQBRACKET,'[',1,2076) -LexToken(NUMBER,'-1',1,2077) +LexToken(ADDITION,'-',1,2077) +LexToken(NUMBER,'1',1,2078) LexToken(SEMICOLON,';',1,2079) -LexToken(NUMBER,'-1',1,2080) +LexToken(ADDITION,'-',1,2080) +LexToken(NUMBER,'1',1,2081) LexToken(SEMICOLON,';',1,2082) LexToken(NUMBER,'0',1,2083) LexToken(SEMICOLON,';',1,2084) @@ -327,7 +333,8 @@ LexToken(VAR,'model',1,2124) LexToken(DOT,'.',1,2129) LexToken(VAR,'firing',1,2130) LexToken(ASSIGNMENT,'=',1,2136) -LexToken(NUMBER,'-1',1,2137) +LexToken(ADDITION,'-',1,2137) +LexToken(NUMBER,'1',1,2138) LexToken(EOL,'\n',1,2139) LexToken(VAR,'model',1,2148) LexToken(DOT,'.',1,2153) |