ignore comma and semicolon at the end of line

1 files changed, 34 insertions, 60 deletions

diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js
index 306efbe2..74395953 100644
--- a/js/Sinks/CMAT3D.js
+++ b/js/Sinks/CMAT3D.js
@@ -41,20 +41,17 @@ LexToken(VAR,'x',1,878)
 LexToken(ASSIGNMENT,'=',1,879)
 LexToken(OPENSQBRACKET,'[',1,880)
 LexToken(CLOSESQBRACKET,']',1,881)
-LexToken(SEMICOLON,';',1,882)
-LexToken(EOL,'\n',1,883)
+LexToken(EOL,'\n',1,882)
 LexToken(VAR,'y',1,888)
 LexToken(ASSIGNMENT,'=',1,889)
 LexToken(OPENSQBRACKET,'[',1,890)
 LexToken(CLOSESQBRACKET,']',1,891)
-LexToken(SEMICOLON,';',1,892)
-LexToken(EOL,'\n',1,893)
+LexToken(EOL,'\n',1,892)
 LexToken(VAR,'typ',1,898)
 LexToken(ASSIGNMENT,'=',1,901)
 LexToken(OPENSQBRACKET,'[',1,902)
 LexToken(CLOSESQBRACKET,']',1,903)
-LexToken(SEMICOLON,';',1,904)
-LexToken(EOL,'\n',1,905)
+LexToken(EOL,'\n',1,904)
 LexToken(SELECT,'select',1,910)
 LexToken(VAR,'job',1,917)
 LexToken(EOL,'\n',1,920)
@@ -65,15 +62,13 @@ LexToken(EOL,'\n',1,940)
 LexToken(VAR,'x',1,949)
 LexToken(ASSIGNMENT,'=',1,950)
 LexToken(VAR,'arg1',1,951)
-LexToken(SEMICOLON,';',1,955)
-LexToken(EOL,'\n',1,956)
+LexToken(EOL,'\n',1,955)
 LexToken(VAR,'graphics',1,965)
 LexToken(ASSIGNMENT,'=',1,973)
 LexToken(VAR,'arg1',1,974)
 LexToken(DOT,'.',1,978)
 LexToken(VAR,'graphics',1,979)
-LexToken(SEMICOLON,';',1,987)
-LexToken(EOL,'\n',1,988)
+LexToken(EOL,'\n',1,987)
 LexToken(VAR,'exprs',1,997)
 LexToken(ASSIGNMENT,'=',1,1002)
 LexToken(VAR,'graphics',1,1003)
@@ -85,8 +80,7 @@ LexToken(ASSIGNMENT,'=',1,1031)
 LexToken(VAR,'arg1',1,1032)
 LexToken(DOT,'.',1,1036)
 LexToken(VAR,'model',1,1037)
-LexToken(SEMICOLON,';',1,1042)
-LexToken(EOL,'\n',1,1043)
+LexToken(EOL,'\n',1,1042)
 LexToken(WHILE,'while',1,1052)
 LexToken(PREVAR_BOOLEAN,'%t',1,1058)
 LexToken(DO,'do',1,1061)
@@ -113,13 +107,13 @@ LexToken(DQSTRING,'"Set Scope parameters"',1,1170)
 LexToken(COMMA,',',1,1171)
 LexToken(OPENSQBRACKET,'[',1,1187)
 LexToken(DQSTRING,'"Bounds Vector X (-1 for standard)"',1,1222)
-LexToken(SEMICOLON,';',1,1223)
+LexToken(SEMICOLON,';\n',1,1223)
 LexToken(DQSTRING,'"Bounds Vector Y (-1 for standard)"',1,1271)
-LexToken(SEMICOLON,';',1,1272)
+LexToken(SEMICOLON,';\n',1,1272)
 LexToken(DQSTRING,'"ColorMap"',1,1295)
-LexToken(SEMICOLON,';',1,1296)
+LexToken(SEMICOLON,';\n',1,1296)
 LexToken(DQSTRING,'"Zmin"',1,1315)
-LexToken(SEMICOLON,';',1,1316)
+LexToken(SEMICOLON,';\n',1,1316)
 LexToken(DQSTRING,'"Zmax"',1,1335)
 LexToken(CLOSESQBRACKET,']',1,1336)
 LexToken(COMMA,',',1,1337)
@@ -158,8 +152,7 @@ LexToken(VAR,'ok',1,1425)
 LexToken(THEN,'then',1,1428)
 LexToken(EOL,'\n',1,1432)
 LexToken(BREAK,'break',1,1449)
-LexToken(COMMA,',',1,1454)
-LexToken(EOL,'\n',1,1455)
+LexToken(EOL,'\n',1,1454)
 LexToken(END,'end',1,1468)
 LexToken(EOL,'\n',1,1498)
 LexToken(VAR,'mess',1,1511)
@@ -251,8 +244,7 @@ LexToken(VAR,'vec_x',1,2001)
 LexToken(COMMA,',',1,2006)
 LexToken(DQSTRING,'"*"',1,2009)
 LexToken(CLOSEBRACKET,')',1,2010)
-LexToken(SEMICOLON,';',1,2011)
-LexToken(EOL,'\n',1,2012)
+LexToken(EOL,'\n',1,2011)
 LexToken(VAR,'size_c',1,2029)
 LexToken(ASSIGNMENT,'=',1,2035)
 LexToken(VAR,'size',1,2036)
@@ -264,8 +256,7 @@ LexToken(CLOSEBRACKET,')',1,2051)
 LexToken(COMMA,',',1,2052)
 LexToken(NUMBER,'1',1,2053)
 LexToken(CLOSEBRACKET,')',1,2054)
-LexToken(SEMICOLON,';',1,2055)
-LexToken(EOL,'\n',1,2056)
+LexToken(EOL,'\n',1,2055)
 LexToken(VAR,'ipar',1,2073)
 LexToken(ASSIGNMENT,'=',1,2077)
 LexToken(OPENSQBRACKET,'[',1,2078)
@@ -277,8 +268,7 @@ LexToken(VAR,'size_c',1,2089)
 LexToken(SEMICOLON,';',1,2095)
 LexToken(VAR,'size_x',1,2096)
 LexToken(CLOSESQBRACKET,']',1,2102)
-LexToken(SEMICOLON,';',1,2103)
-LexToken(EOL,'\n',1,2104)
+LexToken(EOL,'\n',1,2103)
 LexToken(VAR,'rpar',1,2121)
 LexToken(ASSIGNMENT,'=',1,2125)
 LexToken(OPENSQBRACKET,'[',1,2126)
@@ -297,46 +287,39 @@ LexToken(OPENBRACKET,'(',1,2153)
 LexToken(COLON,':',1,2154)
 LexToken(CLOSEBRACKET,')',1,2155)
 LexToken(CLOSESQBRACKET,']',1,2156)
-LexToken(SEMICOLON,';',1,2157)
-LexToken(EOL,'\n',1,2158)
+LexToken(EOL,'\n',1,2157)
 LexToken(VAR,'model',1,2175)
 LexToken(DOT,'.',1,2180)
 LexToken(VAR,'ipar',1,2181)
 LexToken(ASSIGNMENT,'=',1,2185)
 LexToken(VAR,'ipar',1,2186)
-LexToken(SEMICOLON,';',1,2190)
-LexToken(EOL,'\n',1,2191)
+LexToken(EOL,'\n',1,2190)
 LexToken(VAR,'model',1,2208)
 LexToken(DOT,'.',1,2213)
 LexToken(VAR,'rpar',1,2214)
 LexToken(ASSIGNMENT,'=',1,2218)
 LexToken(VAR,'rpar',1,2219)
-LexToken(SEMICOLON,';',1,2223)
-LexToken(EOL,'\n',1,2224)
+LexToken(EOL,'\n',1,2223)
 LexToken(VAR,'graphics',1,2241)
 LexToken(DOT,'.',1,2249)
 LexToken(VAR,'exprs',1,2250)
 LexToken(ASSIGNMENT,'=',1,2255)
 LexToken(VAR,'exprs',1,2256)
-LexToken(SEMICOLON,';',1,2261)
-LexToken(EOL,'\n',1,2262)
+LexToken(EOL,'\n',1,2261)
 LexToken(VAR,'x',1,2279)
 LexToken(DOT,'.',1,2280)
 LexToken(VAR,'graphics',1,2281)
 LexToken(ASSIGNMENT,'=',1,2289)
 LexToken(VAR,'graphics',1,2290)
-LexToken(SEMICOLON,';',1,2298)
-LexToken(EOL,'\n',1,2299)
+LexToken(EOL,'\n',1,2298)
 LexToken(VAR,'x',1,2316)
 LexToken(DOT,'.',1,2317)
 LexToken(VAR,'model',1,2318)
 LexToken(ASSIGNMENT,'=',1,2323)
 LexToken(VAR,'model',1,2324)
-LexToken(SEMICOLON,';',1,2329)
-LexToken(EOL,'\n',1,2330)
+LexToken(EOL,'\n',1,2329)
 LexToken(BREAK,'break',1,2347)
-LexToken(SEMICOLON,';',1,2352)
-LexToken(EOL,'\n',1,2353)
+LexToken(EOL,'\n',1,2352)
 LexToken(END,'end',1,2366)
 LexToken(EOL,'\n',1,2369)
 LexToken(END,'end',1,2378)
@@ -348,48 +331,40 @@ LexToken(EOL,'\n',1,2404)
 LexToken(VAR,'cmin',1,2413)
 LexToken(ASSIGNMENT,'=',1,2418)
 LexToken(NUMBER,'0',1,2420)
-LexToken(SEMICOLON,';',1,2421)
-LexToken(EOL,'\n',1,2422)
+LexToken(EOL,'\n',1,2421)
 LexToken(VAR,'cmax',1,2431)
 LexToken(ASSIGNMENT,'=',1,2436)
 LexToken(NUMBER,'100',1,2438)
-LexToken(SEMICOLON,';',1,2441)
-LexToken(EOL,'\n',1,2442)
+LexToken(EOL,'\n',1,2441)
 LexToken(VAR,'colormap',1,2451)
 LexToken(ASSIGNMENT,'=',1,2460)
 LexToken(VAR,'jetcolormap',1,2462)
 LexToken(OPENBRACKET,'(',1,2473)
 LexToken(NUMBER,'25',1,2474)
 LexToken(CLOSEBRACKET,')',1,2476)
-LexToken(SEMICOLON,';',1,2477)
-LexToken(EOL,'\n',1,2478)
+LexToken(EOL,'\n',1,2477)
 LexToken(VAR,'size_c',1,2487)
 LexToken(ASSIGNMENT,'=',1,2494)
 LexToken(NUMBER,'25',1,2496)
-LexToken(SEMICOLON,';',1,2498)
-LexToken(EOL,'\n',1,2499)
+LexToken(EOL,'\n',1,2498)
 LexToken(VAR,'x',1,2508)
 LexToken(ASSIGNMENT,'=',1,2509)
 LexToken(ADDITION,'-',1,2510)
 LexToken(NUMBER,'1',1,2511)
-LexToken(SEMICOLON,';',1,2512)
-LexToken(EOL,'\n',1,2513)
+LexToken(EOL,'\n',1,2512)
 LexToken(VAR,'y',1,2522)
 LexToken(ASSIGNMENT,'=',1,2523)
 LexToken(ADDITION,'-',1,2524)
 LexToken(NUMBER,'1',1,2525)
-LexToken(SEMICOLON,';',1,2526)
-LexToken(EOL,'\n',1,2527)
+LexToken(EOL,'\n',1,2526)
 LexToken(VAR,'size_x',1,2536)
 LexToken(ASSIGNMENT,'=',1,2543)
 LexToken(NUMBER,'1',1,2545)
-LexToken(SEMICOLON,';',1,2546)
-LexToken(EOL,'\n',1,2547)
+LexToken(EOL,'\n',1,2546)
 LexToken(VAR,'size_y',1,2556)
 LexToken(ASSIGNMENT,'=',1,2563)
 LexToken(NUMBER,'1',1,2565)
-LexToken(SEMICOLON,';',1,2566)
-LexToken(EOL,'\n',1,2567)
+LexToken(EOL,'\n',1,2566)
 LexToken(EOL,'\n',1,2568)
 LexToken(VAR,'model',1,2577)
 LexToken(ASSIGNMENT,'=',1,2582)
@@ -493,7 +468,7 @@ LexToken(CLOSEBRACKET,')',1,2895)
 LexToken(COMMA,',',1,2896)
 LexToken(DQSTRING,'" "',1,2899)
 LexToken(CLOSEBRACKET,')',1,2900)
-LexToken(SEMICOLON,';',1,2901)
+LexToken(SEMICOLON,';\n',1,2901)
 LexToken(VAR,'strcat',1,2911)
 LexToken(OPENBRACKET,'(',1,2917)
 LexToken(VAR,'string',1,2918)
@@ -503,24 +478,23 @@ LexToken(CLOSEBRACKET,')',1,2926)
 LexToken(COMMA,',',1,2927)
 LexToken(DQSTRING,'" "',1,2930)
 LexToken(CLOSEBRACKET,')',1,2931)
-LexToken(SEMICOLON,';',1,2932)
+LexToken(SEMICOLON,';\n',1,2932)
 LexToken(VAR,'string',1,2942)
 LexToken(OPENBRACKET,'(',1,2948)
 LexToken(DQSTRING,'"jetcolormap(25)"',1,2965)
 LexToken(CLOSEBRACKET,')',1,2966)
-LexToken(SEMICOLON,';',1,2967)
+LexToken(SEMICOLON,';\n',1,2967)
 LexToken(VAR,'string',1,2977)
 LexToken(OPENBRACKET,'(',1,2983)
 LexToken(VAR,'cmin',1,2984)
 LexToken(CLOSEBRACKET,')',1,2988)
-LexToken(SEMICOLON,';',1,2989)
+LexToken(SEMICOLON,';\n',1,2989)
 LexToken(VAR,'string',1,2999)
 LexToken(OPENBRACKET,'(',1,3005)
 LexToken(VAR,'cmax',1,3006)
 LexToken(CLOSEBRACKET,')',1,3010)
 LexToken(CLOSESQBRACKET,']',1,3011)
-LexToken(SEMICOLON,';',1,3012)
-LexToken(EOL,'\n',1,3013)
+LexToken(EOL,'\n',1,3012)
 LexToken(VAR,'gr_i',1,3022)
 LexToken(ASSIGNMENT,'=',1,3026)
 LexToken(OPENSQBRACKET,'[',1,3027)