diff options
Diffstat (limited to 'js/MatrixOp')
-rw-r--r-- | js/MatrixOp/CUMSUM.js | 24 | ||||
-rw-r--r-- | js/MatrixOp/EXTRACT.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/EXTTRI.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATBKSL.js | 18 | ||||
-rw-r--r-- | js/MatrixOp/MATCATH.js | 42 | ||||
-rw-r--r-- | js/MatrixOp/MATCATV.js | 42 | ||||
-rw-r--r-- | js/MatrixOp/MATDET.js | 6 | ||||
-rw-r--r-- | js/MatrixOp/MATDIAG.js | 9 | ||||
-rw-r--r-- | js/MatrixOp/MATDIV.js | 18 | ||||
-rw-r--r-- | js/MatrixOp/MATEIG.js | 45 | ||||
-rw-r--r-- | js/MatrixOp/MATEXPM.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATINV.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATLU.js | 18 | ||||
-rw-r--r-- | js/MatrixOp/MATMAGPHI.js | 54 | ||||
-rw-r--r-- | js/MatrixOp/MATMUL.js | 110 | ||||
-rw-r--r-- | js/MatrixOp/MATPINV.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATRESH.js | 29 | ||||
-rw-r--r-- | js/MatrixOp/MATSING.js | 75 | ||||
-rw-r--r-- | js/MatrixOp/MATSUM.js | 18 | ||||
-rw-r--r-- | js/MatrixOp/MATTRAN.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATZCONJ.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/MATZREIM.js | 54 | ||||
-rw-r--r-- | js/MatrixOp/RICC.js | 24 | ||||
-rw-r--r-- | js/MatrixOp/ROOTCOEF.js | 8 | ||||
-rw-r--r-- | js/MatrixOp/SQRT.js | 12 | ||||
-rw-r--r-- | js/MatrixOp/SUBMAT.js | 20 |
26 files changed, 462 insertions, 248 deletions
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) |