ignore comma and semicolon at the end of line

1 files changed, 23 insertions, 42 deletions

diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js
index be5ebb65..82bb1c97 100644
--- a/js/Linear/DLR_f.js
+++ b/js/Linear/DLR_f.js
@@ -41,20 +41,17 @@ LexToken(VAR,'x',1,877)
 LexToken(ASSIGNMENT,'=',1,878)
 LexToken(OPENSQBRACKET,'[',1,879)
 LexToken(CLOSESQBRACKET,']',1,880)
-LexToken(SEMICOLON,';',1,881)
-LexToken(EOL,'\n',1,882)
+LexToken(EOL,'\n',1,881)
 LexToken(VAR,'y',1,887)
 LexToken(ASSIGNMENT,'=',1,888)
 LexToken(OPENSQBRACKET,'[',1,889)
 LexToken(CLOSESQBRACKET,']',1,890)
-LexToken(SEMICOLON,';',1,891)
-LexToken(EOL,'\n',1,892)
+LexToken(EOL,'\n',1,891)
 LexToken(VAR,'typ',1,897)
 LexToken(ASSIGNMENT,'=',1,900)
 LexToken(OPENSQBRACKET,'[',1,901)
 LexToken(CLOSESQBRACKET,']',1,902)
-LexToken(SEMICOLON,';',1,903)
-LexToken(EOL,'\n',1,904)
+LexToken(EOL,'\n',1,903)
 LexToken(SELECT,'select',1,909)
 LexToken(VAR,'job',1,916)
 LexToken(EOL,'\n',1,919)
@@ -65,15 +62,13 @@ LexToken(EOL,'\n',1,939)
 LexToken(VAR,'x',1,948)
 LexToken(ASSIGNMENT,'=',1,949)
 LexToken(VAR,'arg1',1,950)
-LexToken(SEMICOLON,';',1,954)
-LexToken(EOL,'\n',1,955)
+LexToken(EOL,'\n',1,954)
 LexToken(VAR,'graphics',1,964)
 LexToken(ASSIGNMENT,'=',1,972)
 LexToken(VAR,'arg1',1,973)
 LexToken(DOT,'.',1,977)
 LexToken(VAR,'graphics',1,978)
-LexToken(SEMICOLON,';',1,986)
-LexToken(EOL,'\n',1,987)
+LexToken(EOL,'\n',1,986)
 LexToken(VAR,'exprs',1,996)
 LexToken(ASSIGNMENT,'=',1,1001)
 LexToken(VAR,'graphics',1,1002)
@@ -85,15 +80,13 @@ LexToken(ASSIGNMENT,'=',1,1030)
 LexToken(VAR,'arg1',1,1031)
 LexToken(DOT,'.',1,1035)
 LexToken(VAR,'model',1,1036)
-LexToken(SEMICOLON,';',1,1041)
-LexToken(EOL,'\n',1,1042)
+LexToken(EOL,'\n',1,1041)
 LexToken(VAR,'x0',1,1051)
 LexToken(ASSIGNMENT,'=',1,1053)
 LexToken(VAR,'model',1,1054)
 LexToken(DOT,'.',1,1059)
 LexToken(VAR,'dstate',1,1060)
-LexToken(SEMICOLON,';',1,1066)
-LexToken(EOL,'\n',1,1067)
+LexToken(EOL,'\n',1,1066)
 LexToken(VAR,'ns',1,1076)
 LexToken(ASSIGNMENT,'=',1,1078)
 LexToken(VAR,'prod',1,1079)
@@ -103,8 +96,7 @@ LexToken(OPENBRACKET,'(',1,1088)
 LexToken(VAR,'x0',1,1089)
 LexToken(CLOSEBRACKET,')',1,1091)
 LexToken(CLOSEBRACKET,')',1,1092)
-LexToken(SEMICOLON,';',1,1093)
-LexToken(EOL,'\n',1,1094)
+LexToken(EOL,'\n',1,1093)
 LexToken(PREVAR,'%scicos_context',1,1103)
 LexToken(ASSIGNMENT,'=',1,1118)
 LexToken(PREVAR,'%scicos_context',1,1119)
@@ -136,7 +128,7 @@ LexToken(DQSTRING,'"Set discrete SISO transfer parameters"',1,1344)
 LexToken(COMMA,',',1,1345)
 LexToken(OPENSQBRACKET,'[',1,1361)
 LexToken(DQSTRING,'"Numerator (z)"',1,1376)
-LexToken(SEMICOLON,';',1,1377)
+LexToken(SEMICOLON,';\n',1,1377)
 LexToken(DQSTRING,'"Denominator (z)"',1,1407)
 LexToken(CLOSESQBRACKET,']',1,1408)
 LexToken(COMMA,',',1,1409)
@@ -160,8 +152,7 @@ LexToken(VAR,'ok',1,1470)
 LexToken(THEN,'then',1,1473)
 LexToken(EOL,'\n',1,1477)
 LexToken(BREAK,'break',1,1494)
-LexToken(COMMA,',',1,1499)
-LexToken(EOL,'\n',1,1500)
+LexToken(EOL,'\n',1,1499)
 LexToken(END,'end',1,1513)
 LexToken(EOL,'\n',1,1516)
 LexToken(IF,'if',1,1529)
@@ -216,15 +207,13 @@ LexToken(NUMBER,'2',1,1737)
 LexToken(COLON,':',1,1738)
 LexToken(NUMBER,'5',1,1739)
 LexToken(CLOSEBRACKET,')',1,1740)
-LexToken(SEMICOLON,';',1,1741)
-LexToken(EOL,'\n',1,1742)
+LexToken(EOL,'\n',1,1741)
 LexToken(VAR,'graphics',1,1759)
 LexToken(DOT,'.',1,1767)
 LexToken(VAR,'exprs',1,1768)
 LexToken(ASSIGNMENT,'=',1,1773)
 LexToken(VAR,'exprs',1,1774)
-LexToken(SEMICOLON,';',1,1779)
-LexToken(EOL,'\n',1,1780)
+LexToken(EOL,'\n',1,1779)
 LexToken(OPENSQBRACKET,'[',1,1797)
 LexToken(VAR,'ns1',1,1798)
 LexToken(COMMA,',',1,1801)
@@ -271,17 +260,17 @@ LexToken(VAR,'A',1,1975)
 LexToken(OPENBRACKET,'(',1,1976)
 LexToken(COLON,':',1,1977)
 LexToken(CLOSEBRACKET,')',1,1978)
-LexToken(SEMICOLON,';',1,1979)
+LexToken(SEMICOLON,';\n',1,1979)
 LexToken(VAR,'B',1,1997)
 LexToken(OPENBRACKET,'(',1,1998)
 LexToken(COLON,':',1,1999)
 LexToken(CLOSEBRACKET,')',1,2000)
-LexToken(SEMICOLON,';',1,2001)
+LexToken(SEMICOLON,';\n',1,2001)
 LexToken(VAR,'C',1,2019)
 LexToken(OPENBRACKET,'(',1,2020)
 LexToken(COLON,':',1,2021)
 LexToken(CLOSEBRACKET,')',1,2022)
-LexToken(SEMICOLON,';',1,2023)
+LexToken(SEMICOLON,';\n',1,2023)
 LexToken(VAR,'D',1,2041)
 LexToken(OPENBRACKET,'(',1,2042)
 LexToken(COLON,':',1,2043)
@@ -317,8 +306,7 @@ LexToken(OPENSQBRACKET,'[',1,2172)
 LexToken(PREVAR_BOOLEAN,'%t',1,2173)
 LexToken(PREVAR_BOOLEAN,'%f',1,2176)
 LexToken(CLOSESQBRACKET,']',1,2178)
-LexToken(SEMICOLON,';',1,2179)
-LexToken(EOL,'\n',1,2180)
+LexToken(EOL,'\n',1,2179)
 LexToken(ELSE,'else',1,2197)
 LexToken(EOL,'\n',1,2201)
 LexToken(VAR,'mmm',1,2222)
@@ -327,8 +315,7 @@ LexToken(OPENSQBRACKET,'[',1,2226)
 LexToken(PREVAR_BOOLEAN,'%f',1,2227)
 LexToken(PREVAR_BOOLEAN,'%f',1,2230)
 LexToken(CLOSESQBRACKET,']',1,2232)
-LexToken(SEMICOLON,';',1,2233)
-LexToken(EOL,'\n',1,2234)
+LexToken(EOL,'\n',1,2233)
 LexToken(END,'end',1,2251)
 LexToken(EOL,'\n',1,2254)
 LexToken(IF,'if',1,2271)
@@ -355,8 +342,7 @@ LexToken(DOT,'.',1,2355)
 LexToken(VAR,'graphics',1,2356)
 LexToken(ASSIGNMENT,'=',1,2364)
 LexToken(VAR,'graphics',1,2365)
-LexToken(SEMICOLON,';',1,2373)
-LexToken(EOL,'\n',1,2374)
+LexToken(EOL,'\n',1,2373)
 LexToken(VAR,'x',1,2391)
 LexToken(DOT,'.',1,2392)
 LexToken(VAR,'model',1,2393)
@@ -385,29 +371,24 @@ LexToken(EOL,'\n',1,2519)
 LexToken(VAR,'x0',1,2528)
 LexToken(ASSIGNMENT,'=',1,2530)
 LexToken(NUMBER,'0',1,2531)
-LexToken(SEMICOLON,';',1,2532)
-LexToken(EOL,'\n',1,2533)
+LexToken(EOL,'\n',1,2532)
 LexToken(VAR,'A',1,2542)
 LexToken(ASSIGNMENT,'=',1,2543)
 LexToken(ADDITION,'-',1,2544)
 LexToken(NUMBER,'1',1,2545)
-LexToken(SEMICOLON,';',1,2546)
-LexToken(EOL,'\n',1,2547)
+LexToken(EOL,'\n',1,2546)
 LexToken(VAR,'B',1,2556)
 LexToken(ASSIGNMENT,'=',1,2557)
 LexToken(NUMBER,'1',1,2558)
-LexToken(SEMICOLON,';',1,2559)
-LexToken(EOL,'\n',1,2560)
+LexToken(EOL,'\n',1,2559)
 LexToken(VAR,'C',1,2569)
 LexToken(ASSIGNMENT,'=',1,2570)
 LexToken(NUMBER,'1',1,2571)
-LexToken(SEMICOLON,';',1,2572)
-LexToken(EOL,'\n',1,2573)
+LexToken(EOL,'\n',1,2572)
 LexToken(VAR,'D',1,2582)
 LexToken(ASSIGNMENT,'=',1,2583)
 LexToken(NUMBER,'0',1,2584)
-LexToken(SEMICOLON,';',1,2585)
-LexToken(EOL,'\n',1,2586)
+LexToken(EOL,'\n',1,2585)
 LexToken(VAR,'exprs',1,2595)
 LexToken(ASSIGNMENT,'=',1,2600)
 LexToken(OPENSQBRACKET,'[',1,2601)