diff options
Diffstat (limited to 'js/Hydraulics')
-rw-r--r-- | js/Hydraulics/Bache.js | 39 | ||||
-rw-r--r-- | js/Hydraulics/Flowmeter.js | 78 | ||||
-rw-r--r-- | js/Hydraulics/PerteDP.js | 39 | ||||
-rw-r--r-- | js/Hydraulics/PuitsP.js | 30 | ||||
-rw-r--r-- | js/Hydraulics/SourceP.js | 33 | ||||
-rw-r--r-- | js/Hydraulics/VanneReglante.js | 39 |
6 files changed, 86 insertions, 172 deletions
diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 2f1de7d4..74833128 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -45,20 +45,17 @@ LexToken(VAR,'x',1,1093) LexToken(ASSIGNMENT,'=',1,1094) LexToken(OPENSQBRACKET,'[',1,1095) LexToken(CLOSESQBRACKET,']',1,1096) -LexToken(SEMICOLON,';',1,1097) -LexToken(EOL,'\n',1,1098) +LexToken(EOL,'\n',1,1097) LexToken(VAR,'y',1,1103) LexToken(ASSIGNMENT,'=',1,1104) LexToken(OPENSQBRACKET,'[',1,1105) LexToken(CLOSESQBRACKET,']',1,1106) -LexToken(SEMICOLON,';',1,1107) -LexToken(EOL,'\n',1,1108) +LexToken(EOL,'\n',1,1107) LexToken(VAR,'typ',1,1113) LexToken(ASSIGNMENT,'=',1,1116) LexToken(OPENSQBRACKET,'[',1,1117) LexToken(CLOSESQBRACKET,']',1,1118) -LexToken(SEMICOLON,';',1,1119) -LexToken(EOL,'\n',1,1120) +LexToken(EOL,'\n',1,1119) LexToken(EOL,'\n',1,1121) LexToken(SELECT,'select',1,1126) LexToken(VAR,'job',1,1133) @@ -70,15 +67,13 @@ LexToken(EOL,'\n',1,1156) LexToken(VAR,'x',1,1165) LexToken(ASSIGNMENT,'=',1,1166) LexToken(VAR,'arg1',1,1167) -LexToken(SEMICOLON,';',1,1171) -LexToken(EOL,'\n',1,1172) +LexToken(EOL,'\n',1,1171) LexToken(VAR,'graphics',1,1181) LexToken(ASSIGNMENT,'=',1,1189) LexToken(VAR,'arg1',1,1190) LexToken(DOT,'.',1,1194) LexToken(VAR,'graphics',1,1195) -LexToken(SEMICOLON,';',1,1203) -LexToken(EOL,'\n',1,1204) +LexToken(EOL,'\n',1,1203) LexToken(VAR,'exprs',1,1213) LexToken(ASSIGNMENT,'=',1,1218) LexToken(VAR,'graphics',1,1219) @@ -90,8 +85,7 @@ LexToken(ASSIGNMENT,'=',1,1247) LexToken(VAR,'arg1',1,1248) LexToken(DOT,'.',1,1252) LexToken(VAR,'model',1,1253) -LexToken(SEMICOLON,';',1,1258) -LexToken(EOL,'\n',1,1259) +LexToken(EOL,'\n',1,1258) LexToken(WHILE,'while',1,1268) LexToken(PREVAR_BOOLEAN,'%t',1,1274) LexToken(DO,'do',1,1277) @@ -203,8 +197,7 @@ 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(EOL,'\n',1,2066) LexToken(END,'end',1,2080) LexToken(EOL,'\n',1,2083) LexToken(VAR,'model',1,2096) @@ -272,8 +265,7 @@ 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(EOL,'\n',1,2291) LexToken(VAR,'x',1,2305) LexToken(DOT,'.',1,2306) LexToken(VAR,'model',1,2307) @@ -315,8 +307,7 @@ 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(EOL,'\n',1,2455) LexToken(VAR,'model',1,2465) LexToken(DOT,'.',1,2470) LexToken(VAR,'out',1,2471) @@ -330,8 +321,7 @@ 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(EOL,'\n',1,2486) LexToken(VAR,'Patm',1,2496) LexToken(ASSIGNMENT,'=',1,2500) LexToken(NUMBER,'1.013E5',1,2501) @@ -434,8 +424,7 @@ 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(EOL,'\n',1,2842) LexToken(VAR,'mo',1,2852) LexToken(DOT,'.',1,2854) LexToken(VAR,'outputs',1,2855) @@ -445,8 +434,7 @@ 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(EOL,'\n',1,2886) LexToken(VAR,'mo',1,2896) LexToken(DOT,'.',1,2898) LexToken(VAR,'parameters',1,2899) @@ -589,8 +577,7 @@ 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,3265) LexToken(EOL,'\n',1,3377) LexToken(VAR,'x',1,3386) LexToken(ASSIGNMENT,'=',1,3387) diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index a9b42911..d413a98f 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -43,20 +43,17 @@ LexToken(VAR,'x',1,1036) LexToken(ASSIGNMENT,'=',1,1037) LexToken(OPENSQBRACKET,'[',1,1038) LexToken(CLOSESQBRACKET,']',1,1039) -LexToken(SEMICOLON,';',1,1040) -LexToken(EOL,'\n',1,1041) +LexToken(EOL,'\n',1,1040) LexToken(VAR,'y',1,1046) LexToken(ASSIGNMENT,'=',1,1047) LexToken(OPENSQBRACKET,'[',1,1048) LexToken(CLOSESQBRACKET,']',1,1049) -LexToken(SEMICOLON,';',1,1050) -LexToken(EOL,'\n',1,1051) +LexToken(EOL,'\n',1,1050) LexToken(VAR,'typ',1,1056) LexToken(ASSIGNMENT,'=',1,1059) LexToken(OPENSQBRACKET,'[',1,1060) LexToken(CLOSESQBRACKET,']',1,1061) -LexToken(SEMICOLON,';',1,1062) -LexToken(EOL,'\n',1,1063) +LexToken(EOL,'\n',1,1062) LexToken(SELECT,'select',1,1068) LexToken(VAR,'job',1,1075) LexToken(EOL,'\n',1,1078) @@ -67,15 +64,13 @@ LexToken(EOL,'\n',1,1098) LexToken(VAR,'x',1,1107) LexToken(ASSIGNMENT,'=',1,1108) LexToken(VAR,'arg1',1,1109) -LexToken(SEMICOLON,';',1,1113) -LexToken(EOL,'\n',1,1114) +LexToken(EOL,'\n',1,1113) LexToken(VAR,'graphics',1,1123) LexToken(ASSIGNMENT,'=',1,1131) LexToken(VAR,'arg1',1,1132) LexToken(DOT,'.',1,1136) LexToken(VAR,'graphics',1,1137) -LexToken(SEMICOLON,';',1,1145) -LexToken(EOL,'\n',1,1146) +LexToken(EOL,'\n',1,1145) LexToken(VAR,'exprs',1,1155) LexToken(ASSIGNMENT,'=',1,1160) LexToken(VAR,'graphics',1,1161) @@ -87,8 +82,7 @@ LexToken(ASSIGNMENT,'=',1,1189) LexToken(VAR,'arg1',1,1190) LexToken(DOT,'.',1,1194) LexToken(VAR,'model',1,1195) -LexToken(SEMICOLON,';',1,1200) -LexToken(EOL,'\n',1,1201) +LexToken(EOL,'\n',1,1200) LexToken(VAR,'x',1,1210) LexToken(ASSIGNMENT,'=',1,1211) LexToken(VAR,'arg1',1,1212) @@ -141,8 +135,7 @@ LexToken(VAR,'ok',1,1404) LexToken(THEN,'then',1,1407) LexToken(EOL,'\n',1,1411) LexToken(BREAK,'break',1,1428) -LexToken(COMMA,',',1,1433) -LexToken(EOL,'\n',1,1434) +LexToken(EOL,'\n',1,1433) LexToken(END,'end',1,1447) LexToken(EOL,'\n',1,1450) LexToken(VAR,'x',1,1463) @@ -199,20 +192,17 @@ LexToken(VAR,'Typein',1,1716) LexToken(ASSIGNMENT,'=',1,1722) LexToken(OPENSQBRACKET,'[',1,1723) LexToken(CLOSESQBRACKET,']',1,1724) -LexToken(SEMICOLON,';',1,1725) -LexToken(EOL,'\n',1,1726) +LexToken(EOL,'\n',1,1725) LexToken(VAR,'Typeout',1,1735) LexToken(ASSIGNMENT,'=',1,1742) LexToken(OPENSQBRACKET,'[',1,1743) LexToken(CLOSESQBRACKET,']',1,1744) -LexToken(SEMICOLON,';',1,1745) -LexToken(EOL,'\n',1,1746) +LexToken(EOL,'\n',1,1745) LexToken(VAR,'MI',1,1755) LexToken(ASSIGNMENT,'=',1,1757) LexToken(OPENSQBRACKET,'[',1,1758) LexToken(CLOSESQBRACKET,']',1,1759) -LexToken(SEMICOLON,';',1,1760) -LexToken(EOL,'\n',1,1761) +LexToken(EOL,'\n',1,1760) LexToken(VAR,'MO',1,1770) LexToken(ASSIGNMENT,'=',1,1772) LexToken(OPENSQBRACKET,'[',1,1773) @@ -288,8 +278,7 @@ LexToken(VAR,'Typein',1,1944) LexToken(SEMICOLON,';',1,1950) LexToken(DQSTRING,'"E"',1,1954) LexToken(CLOSESQBRACKET,']',1,1955) -LexToken(SEMICOLON,';',1,1956) -LexToken(EOL,'\n',1,1957) +LexToken(EOL,'\n',1,1956) LexToken(VAR,'MI',1,1974) LexToken(ASSIGNMENT,'=',1,1976) LexToken(OPENSQBRACKET,'[',1,1977) @@ -300,8 +289,7 @@ LexToken(OPENBRACKET,'(',1,1989) LexToken(VAR,'i',1,1990) LexToken(CLOSEBRACKET,')',1,1991) LexToken(CLOSESQBRACKET,']',1,1992) -LexToken(SEMICOLON,';',1,1993) -LexToken(EOL,'\n',1,1994) +LexToken(EOL,'\n',1,1993) LexToken(END,'end',1,2007) LexToken(EOL,'\n',1,2010) LexToken(IF,'if',1,2023) @@ -322,8 +310,7 @@ LexToken(VAR,'Typein',1,2067) LexToken(SEMICOLON,';',1,2073) LexToken(DQSTRING,'"I"',1,2077) LexToken(CLOSESQBRACKET,']',1,2078) -LexToken(SEMICOLON,';',1,2079) -LexToken(EOL,'\n',1,2080) +LexToken(EOL,'\n',1,2079) LexToken(VAR,'MI',1,2097) LexToken(ASSIGNMENT,'=',1,2099) LexToken(OPENSQBRACKET,'[',1,2100) @@ -334,8 +321,7 @@ LexToken(OPENBRACKET,'(',1,2112) LexToken(VAR,'i',1,2113) LexToken(CLOSEBRACKET,')',1,2114) LexToken(CLOSESQBRACKET,']',1,2115) -LexToken(SEMICOLON,';',1,2116) -LexToken(EOL,'\n',1,2117) +LexToken(EOL,'\n',1,2116) LexToken(END,'end',1,2130) LexToken(EOL,'\n',1,2133) LexToken(IF,'if',1,2146) @@ -357,8 +343,7 @@ LexToken(VAR,'Typeout',1,2190) LexToken(SEMICOLON,';',1,2197) LexToken(DQSTRING,'"E"',1,2200) LexToken(CLOSESQBRACKET,']',1,2201) -LexToken(SEMICOLON,';',1,2202) -LexToken(EOL,'\n',1,2203) +LexToken(EOL,'\n',1,2202) LexToken(VAR,'MO',1,2220) LexToken(ASSIGNMENT,'=',1,2222) LexToken(OPENSQBRACKET,'[',1,2223) @@ -369,8 +354,7 @@ LexToken(OPENBRACKET,'(',1,2235) LexToken(VAR,'i',1,2236) LexToken(CLOSEBRACKET,')',1,2237) LexToken(CLOSESQBRACKET,']',1,2238) -LexToken(SEMICOLON,';',1,2239) -LexToken(EOL,'\n',1,2240) +LexToken(EOL,'\n',1,2239) LexToken(END,'end',1,2253) LexToken(EOL,'\n',1,2256) LexToken(IF,'if',1,2269) @@ -392,8 +376,7 @@ LexToken(VAR,'Typeout',1,2313) LexToken(SEMICOLON,';',1,2320) LexToken(DQSTRING,'"I"',1,2323) LexToken(CLOSESQBRACKET,']',1,2324) -LexToken(SEMICOLON,';',1,2325) -LexToken(EOL,'\n',1,2326) +LexToken(EOL,'\n',1,2325) LexToken(VAR,'MO',1,2343) LexToken(ASSIGNMENT,'=',1,2345) LexToken(OPENSQBRACKET,'[',1,2346) @@ -404,8 +387,7 @@ LexToken(OPENBRACKET,'(',1,2358) LexToken(VAR,'i',1,2359) LexToken(CLOSEBRACKET,')',1,2360) LexToken(CLOSESQBRACKET,']',1,2361) -LexToken(SEMICOLON,';',1,2362) -LexToken(EOL,'\n',1,2363) +LexToken(EOL,'\n',1,2362) LexToken(END,'end',1,2376) LexToken(EOL,'\n',1,2379) LexToken(END,'end',1,2388) @@ -427,29 +409,25 @@ LexToken(DOT,'.',1,2456) LexToken(VAR,'sim',1,2457) LexToken(ASSIGNMENT,'=',1,2460) LexToken(VAR,'ModelName',1,2461) -LexToken(SEMICOLON,';',1,2470) -LexToken(EOL,'\n',1,2471) +LexToken(EOL,'\n',1,2470) LexToken(VAR,'mo',1,2480) LexToken(DOT,'.',1,2482) LexToken(VAR,'inputs',1,2483) LexToken(ASSIGNMENT,'=',1,2489) LexToken(VAR,'MI',1,2490) -LexToken(SEMICOLON,';',1,2492) -LexToken(EOL,'\n',1,2493) +LexToken(EOL,'\n',1,2492) LexToken(VAR,'mo',1,2502) LexToken(DOT,'.',1,2504) LexToken(VAR,'outputs',1,2505) LexToken(ASSIGNMENT,'=',1,2512) LexToken(VAR,'MO',1,2513) -LexToken(SEMICOLON,';',1,2515) -LexToken(EOL,'\n',1,2516) +LexToken(EOL,'\n',1,2515) LexToken(VAR,'model',1,2525) LexToken(DOT,'.',1,2530) LexToken(VAR,'rpar',1,2531) LexToken(ASSIGNMENT,'=',1,2535) LexToken(VAR,'PrametersValue',1,2536) -LexToken(SEMICOLON,';',1,2550) -LexToken(EOL,'\n',1,2551) +LexToken(EOL,'\n',1,2550) LexToken(VAR,'mo',1,2560) LexToken(DOT,'.',1,2562) LexToken(VAR,'parameters',1,2563) @@ -465,8 +443,7 @@ LexToken(OPENBRACKET,'(',1,2614) LexToken(VAR,'ParametersName',1,2615) LexToken(CLOSEBRACKET,')',1,2629) LexToken(CLOSEBRACKET,')',1,2630) -LexToken(SEMICOLON,';',1,2631) -LexToken(EOL,'\n',1,2632) +LexToken(EOL,'\n',1,2631) LexToken(VAR,'exprs',1,2641) LexToken(ASSIGNMENT,'=',1,2646) LexToken(DQSTRING,'"1"',1,2649) @@ -475,8 +452,7 @@ LexToken(VAR,'gr_i',1,2659) LexToken(ASSIGNMENT,'=',1,2663) LexToken(OPENSQBRACKET,'[',1,2664) LexToken(CLOSESQBRACKET,']',1,2665) -LexToken(SEMICOLON,';',1,2666) -LexToken(EOL,'\n',1,2667) +LexToken(EOL,'\n',1,2666) LexToken(VAR,'model',1,2676) LexToken(DOT,'.',1,2681) LexToken(VAR,'blocktype',1,2682) @@ -564,8 +540,7 @@ LexToken(DOT,'.',1,2932) LexToken(VAR,'in_implicit',1,2933) LexToken(ASSIGNMENT,'=',1,2944) LexToken(VAR,'Typein',1,2945) -LexToken(SEMICOLON,';',1,2951) -LexToken(EOL,'\n',1,2952) +LexToken(EOL,'\n',1,2951) LexToken(VAR,'x',1,2961) LexToken(DOT,'.',1,2962) LexToken(VAR,'graphics',1,2963) @@ -573,8 +548,7 @@ LexToken(DOT,'.',1,2971) LexToken(VAR,'out_implicit',1,2972) LexToken(ASSIGNMENT,'=',1,2984) LexToken(VAR,'Typeout',1,2985) -LexToken(SEMICOLON,';',1,2992) -LexToken(EOL,'\n',1,2993) +LexToken(EOL,'\n',1,2992) LexToken(END,'end',1,2998) LexToken(EOL,'\n',1,3001) LexToken(ENDFUNCTION,'endfunction',1,3002) diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 3927b110..d3584ef4 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -45,20 +45,17 @@ LexToken(VAR,'x',1,1095) LexToken(ASSIGNMENT,'=',1,1096) LexToken(OPENSQBRACKET,'[',1,1097) LexToken(CLOSESQBRACKET,']',1,1098) -LexToken(SEMICOLON,';',1,1099) -LexToken(EOL,'\n',1,1100) +LexToken(EOL,'\n',1,1099) LexToken(VAR,'y',1,1105) LexToken(ASSIGNMENT,'=',1,1106) LexToken(OPENSQBRACKET,'[',1,1107) LexToken(CLOSESQBRACKET,']',1,1108) -LexToken(SEMICOLON,';',1,1109) -LexToken(EOL,'\n',1,1110) +LexToken(EOL,'\n',1,1109) LexToken(VAR,'typ',1,1115) LexToken(ASSIGNMENT,'=',1,1118) LexToken(OPENSQBRACKET,'[',1,1119) LexToken(CLOSESQBRACKET,']',1,1120) -LexToken(SEMICOLON,';',1,1121) -LexToken(EOL,'\n',1,1122) +LexToken(EOL,'\n',1,1121) LexToken(EOL,'\n',1,1123) LexToken(SELECT,'select',1,1128) LexToken(VAR,'job',1,1135) @@ -70,15 +67,13 @@ LexToken(EOL,'\n',1,1158) LexToken(VAR,'x',1,1167) LexToken(ASSIGNMENT,'=',1,1168) LexToken(VAR,'arg1',1,1169) -LexToken(SEMICOLON,';',1,1173) -LexToken(EOL,'\n',1,1174) +LexToken(EOL,'\n',1,1173) LexToken(VAR,'graphics',1,1183) LexToken(ASSIGNMENT,'=',1,1191) LexToken(VAR,'arg1',1,1192) LexToken(DOT,'.',1,1196) LexToken(VAR,'graphics',1,1197) -LexToken(SEMICOLON,';',1,1205) -LexToken(EOL,'\n',1,1206) +LexToken(EOL,'\n',1,1205) LexToken(VAR,'exprs',1,1215) LexToken(ASSIGNMENT,'=',1,1220) LexToken(VAR,'graphics',1,1221) @@ -90,8 +85,7 @@ LexToken(ASSIGNMENT,'=',1,1249) LexToken(VAR,'arg1',1,1250) LexToken(DOT,'.',1,1254) LexToken(VAR,'model',1,1255) -LexToken(SEMICOLON,';',1,1260) -LexToken(EOL,'\n',1,1261) +LexToken(EOL,'\n',1,1260) LexToken(WHILE,'while',1,1270) LexToken(PREVAR_BOOLEAN,'%t',1,1276) LexToken(DO,'do',1,1279) @@ -174,8 +168,7 @@ 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(EOL,'\n',1,1844) LexToken(END,'end',1,1858) LexToken(EOL,'\n',1,1861) LexToken(VAR,'model',1,1874) @@ -231,8 +224,7 @@ 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(EOL,'\n',1,2045) LexToken(VAR,'x',1,2059) LexToken(DOT,'.',1,2060) LexToken(VAR,'model',1,2061) @@ -260,8 +252,7 @@ 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(EOL,'\n',1,2175) LexToken(VAR,'model',1,2185) LexToken(DOT,'.',1,2190) LexToken(VAR,'out',1,2191) @@ -269,8 +260,7 @@ 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(EOL,'\n',1,2198) LexToken(VAR,'L',1,2208) LexToken(ASSIGNMENT,'=',1,2209) LexToken(NUMBER,'10',1,2210) @@ -351,15 +341,13 @@ 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(EOL,'\n',1,2489) 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(EOL,'\n',1,2514) LexToken(VAR,'mo',1,2524) LexToken(DOT,'.',1,2526) LexToken(VAR,'parameters',1,2527) @@ -475,8 +463,7 @@ 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(EOL,'\n',1,2827) LexToken(VAR,'x',1,2837) LexToken(ASSIGNMENT,'=',1,2838) LexToken(VAR,'standard_define',1,2839) diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 1e8efbeb..063e7814 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -45,20 +45,17 @@ LexToken(VAR,'x',1,1094) LexToken(ASSIGNMENT,'=',1,1095) LexToken(OPENSQBRACKET,'[',1,1096) LexToken(CLOSESQBRACKET,']',1,1097) -LexToken(SEMICOLON,';',1,1098) -LexToken(EOL,'\n',1,1099) +LexToken(EOL,'\n',1,1098) LexToken(VAR,'y',1,1104) LexToken(ASSIGNMENT,'=',1,1105) LexToken(OPENSQBRACKET,'[',1,1106) LexToken(CLOSESQBRACKET,']',1,1107) -LexToken(SEMICOLON,';',1,1108) -LexToken(EOL,'\n',1,1109) +LexToken(EOL,'\n',1,1108) LexToken(VAR,'typ',1,1114) LexToken(ASSIGNMENT,'=',1,1117) LexToken(OPENSQBRACKET,'[',1,1118) LexToken(CLOSESQBRACKET,']',1,1119) -LexToken(SEMICOLON,';',1,1120) -LexToken(EOL,'\n',1,1121) +LexToken(EOL,'\n',1,1120) LexToken(EOL,'\n',1,1122) LexToken(SELECT,'select',1,1127) LexToken(VAR,'job',1,1134) @@ -70,15 +67,13 @@ LexToken(EOL,'\n',1,1157) LexToken(VAR,'x',1,1166) LexToken(ASSIGNMENT,'=',1,1167) LexToken(VAR,'arg1',1,1168) -LexToken(SEMICOLON,';',1,1172) -LexToken(EOL,'\n',1,1173) +LexToken(EOL,'\n',1,1172) LexToken(VAR,'graphics',1,1182) LexToken(ASSIGNMENT,'=',1,1190) LexToken(VAR,'arg1',1,1191) LexToken(DOT,'.',1,1195) LexToken(VAR,'graphics',1,1196) -LexToken(SEMICOLON,';',1,1204) -LexToken(EOL,'\n',1,1205) +LexToken(EOL,'\n',1,1204) LexToken(VAR,'exprs',1,1214) LexToken(ASSIGNMENT,'=',1,1219) LexToken(VAR,'graphics',1,1220) @@ -90,8 +85,7 @@ LexToken(ASSIGNMENT,'=',1,1248) LexToken(VAR,'arg1',1,1249) LexToken(DOT,'.',1,1253) LexToken(VAR,'model',1,1254) -LexToken(SEMICOLON,';',1,1259) -LexToken(EOL,'\n',1,1260) +LexToken(EOL,'\n',1,1259) LexToken(WHILE,'while',1,1269) LexToken(PREVAR_BOOLEAN,'%t',1,1275) LexToken(DO,'do',1,1278) @@ -156,8 +150,7 @@ 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(EOL,'\n',1,1729) LexToken(END,'end',1,1743) LexToken(EOL,'\n',1,1746) LexToken(VAR,'model',1,1759) @@ -205,8 +198,7 @@ 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(EOL,'\n',1,1940) LexToken(VAR,'x',1,1954) LexToken(DOT,'.',1,1955) LexToken(VAR,'model',1,1956) @@ -298,8 +290,7 @@ 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(EOL,'\n',1,2333) LexToken(VAR,'mo',1,2343) LexToken(DOT,'.',1,2345) LexToken(VAR,'parameters',1,2346) @@ -380,8 +371,7 @@ 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(EOL,'\n',1,2643) LexToken(VAR,'x',1,2653) LexToken(ASSIGNMENT,'=',1,2654) LexToken(VAR,'standard_define',1,2655) diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 1f4a948d..8cfb6e50 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -45,20 +45,17 @@ LexToken(VAR,'x',1,1095) LexToken(ASSIGNMENT,'=',1,1096) LexToken(OPENSQBRACKET,'[',1,1097) LexToken(CLOSESQBRACKET,']',1,1098) -LexToken(SEMICOLON,';',1,1099) -LexToken(EOL,'\n',1,1100) +LexToken(EOL,'\n',1,1099) LexToken(VAR,'y',1,1105) LexToken(ASSIGNMENT,'=',1,1106) LexToken(OPENSQBRACKET,'[',1,1107) LexToken(CLOSESQBRACKET,']',1,1108) -LexToken(SEMICOLON,';',1,1109) -LexToken(EOL,'\n',1,1110) +LexToken(EOL,'\n',1,1109) LexToken(VAR,'typ',1,1115) LexToken(ASSIGNMENT,'=',1,1118) LexToken(OPENSQBRACKET,'[',1,1119) LexToken(CLOSESQBRACKET,']',1,1120) -LexToken(SEMICOLON,';',1,1121) -LexToken(EOL,'\n',1,1122) +LexToken(EOL,'\n',1,1121) LexToken(EOL,'\n',1,1123) LexToken(SELECT,'select',1,1128) LexToken(VAR,'job',1,1135) @@ -70,15 +67,13 @@ LexToken(EOL,'\n',1,1158) LexToken(VAR,'x',1,1167) LexToken(ASSIGNMENT,'=',1,1168) LexToken(VAR,'arg1',1,1169) -LexToken(SEMICOLON,';',1,1173) -LexToken(EOL,'\n',1,1174) +LexToken(EOL,'\n',1,1173) LexToken(VAR,'graphics',1,1183) LexToken(ASSIGNMENT,'=',1,1191) LexToken(VAR,'arg1',1,1192) LexToken(DOT,'.',1,1196) LexToken(VAR,'graphics',1,1197) -LexToken(SEMICOLON,';',1,1205) -LexToken(EOL,'\n',1,1206) +LexToken(EOL,'\n',1,1205) LexToken(VAR,'exprs',1,1215) LexToken(ASSIGNMENT,'=',1,1220) LexToken(VAR,'graphics',1,1221) @@ -90,8 +85,7 @@ LexToken(ASSIGNMENT,'=',1,1249) LexToken(VAR,'arg1',1,1250) LexToken(DOT,'.',1,1254) LexToken(VAR,'model',1,1255) -LexToken(SEMICOLON,';',1,1260) -LexToken(EOL,'\n',1,1261) +LexToken(EOL,'\n',1,1260) LexToken(WHILE,'while',1,1270) LexToken(PREVAR_BOOLEAN,'%t',1,1276) LexToken(DO,'do',1,1279) @@ -156,8 +150,7 @@ 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(EOL,'\n',1,1728) LexToken(END,'end',1,1742) LexToken(EOL,'\n',1,1745) LexToken(VAR,'model',1,1758) @@ -206,8 +199,7 @@ 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(EOL,'\n',1,2020) LexToken(VAR,'x',1,2034) LexToken(DOT,'.',1,2035) LexToken(VAR,'model',1,2036) @@ -298,8 +290,7 @@ 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(EOL,'\n',1,2412) LexToken(VAR,'mo',1,2422) LexToken(DOT,'.',1,2424) LexToken(VAR,'outputs',1,2425) @@ -307,8 +298,7 @@ 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(EOL,'\n',1,2438) LexToken(VAR,'mo',1,2448) LexToken(DOT,'.',1,2450) LexToken(VAR,'parameters',1,2451) @@ -406,8 +396,7 @@ 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(EOL,'\n',1,2746) LexToken(VAR,'x',1,2756) LexToken(ASSIGNMENT,'=',1,2757) LexToken(VAR,'standard_define',1,2758) diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index b564279a..e6ab22dd 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -45,20 +45,17 @@ LexToken(VAR,'x',1,1101) LexToken(ASSIGNMENT,'=',1,1102) LexToken(OPENSQBRACKET,'[',1,1103) LexToken(CLOSESQBRACKET,']',1,1104) -LexToken(SEMICOLON,';',1,1105) -LexToken(EOL,'\n',1,1106) +LexToken(EOL,'\n',1,1105) LexToken(VAR,'y',1,1111) LexToken(ASSIGNMENT,'=',1,1112) LexToken(OPENSQBRACKET,'[',1,1113) LexToken(CLOSESQBRACKET,']',1,1114) -LexToken(SEMICOLON,';',1,1115) -LexToken(EOL,'\n',1,1116) +LexToken(EOL,'\n',1,1115) LexToken(VAR,'typ',1,1121) LexToken(ASSIGNMENT,'=',1,1124) LexToken(OPENSQBRACKET,'[',1,1125) LexToken(CLOSESQBRACKET,']',1,1126) -LexToken(SEMICOLON,';',1,1127) -LexToken(EOL,'\n',1,1128) +LexToken(EOL,'\n',1,1127) LexToken(EOL,'\n',1,1129) LexToken(SELECT,'select',1,1134) LexToken(VAR,'job',1,1141) @@ -70,15 +67,13 @@ LexToken(EOL,'\n',1,1164) LexToken(VAR,'x',1,1173) LexToken(ASSIGNMENT,'=',1,1174) LexToken(VAR,'arg1',1,1175) -LexToken(SEMICOLON,';',1,1179) -LexToken(EOL,'\n',1,1180) +LexToken(EOL,'\n',1,1179) LexToken(VAR,'graphics',1,1189) LexToken(ASSIGNMENT,'=',1,1197) LexToken(VAR,'arg1',1,1198) LexToken(DOT,'.',1,1202) LexToken(VAR,'graphics',1,1203) -LexToken(SEMICOLON,';',1,1211) -LexToken(EOL,'\n',1,1212) +LexToken(EOL,'\n',1,1211) LexToken(VAR,'exprs',1,1221) LexToken(ASSIGNMENT,'=',1,1226) LexToken(VAR,'graphics',1,1227) @@ -90,8 +85,7 @@ LexToken(ASSIGNMENT,'=',1,1255) LexToken(VAR,'arg1',1,1256) LexToken(DOT,'.',1,1260) LexToken(VAR,'model',1,1261) -LexToken(SEMICOLON,';',1,1266) -LexToken(EOL,'\n',1,1267) +LexToken(EOL,'\n',1,1266) LexToken(WHILE,'while',1,1276) LexToken(PREVAR_BOOLEAN,'%t',1,1282) LexToken(DO,'do',1,1285) @@ -138,8 +132,7 @@ 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(EOL,'\n',1,1498) LexToken(END,'end',1,1512) LexToken(EOL,'\n',1,1515) LexToken(VAR,'model',1,1528) @@ -180,8 +173,7 @@ 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(EOL,'\n',1,1742) LexToken(VAR,'x',1,1756) LexToken(DOT,'.',1,1757) LexToken(VAR,'model',1,1758) @@ -211,8 +203,7 @@ 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(EOL,'\n',1,1874) LexToken(VAR,'model',1,1884) LexToken(DOT,'.',1,1889) LexToken(VAR,'out',1,1890) @@ -220,8 +211,7 @@ 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(EOL,'\n',1,1897) LexToken(VAR,'Cvmax',1,1907) LexToken(ASSIGNMENT,'=',1,1912) LexToken(NUMBER,'8005.42',1,1913) @@ -282,15 +272,13 @@ 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(EOL,'\n',1,2147) 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(EOL,'\n',1,2172) LexToken(VAR,'mo',1,2182) LexToken(DOT,'.',1,2184) LexToken(VAR,'parameters',1,2185) @@ -370,8 +358,7 @@ 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(EOL,'\n',1,2412) LexToken(VAR,'x',1,2422) LexToken(ASSIGNMENT,'=',1,2423) LexToken(VAR,'standard_define',1,2424) |