ignore comma and semicolon at the end of line

1 files changed, 31 insertions, 52 deletions

diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index f30aa67c..64bbeabc 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -71,20 +71,17 @@ LexToken(VAR,'x',1,2606)
 LexToken(ASSIGNMENT,'=',1,2607)
 LexToken(OPENSQBRACKET,'[',1,2608)
 LexToken(CLOSESQBRACKET,']',1,2609)
-LexToken(SEMICOLON,';',1,2610)
-LexToken(EOL,'\n',1,2611)
+LexToken(EOL,'\n',1,2610)
 LexToken(VAR,'y',1,2616)
 LexToken(ASSIGNMENT,'=',1,2617)
 LexToken(OPENSQBRACKET,'[',1,2618)
 LexToken(CLOSESQBRACKET,']',1,2619)
-LexToken(SEMICOLON,';',1,2620)
-LexToken(EOL,'\n',1,2621)
+LexToken(EOL,'\n',1,2620)
 LexToken(VAR,'typ',1,2626)
 LexToken(ASSIGNMENT,'=',1,2629)
 LexToken(OPENSQBRACKET,'[',1,2630)
 LexToken(CLOSESQBRACKET,']',1,2631)
-LexToken(SEMICOLON,';',1,2632)
-LexToken(EOL,'\n',1,2633)
+LexToken(EOL,'\n',1,2632)
 LexToken(SELECT,'select',1,2638)
 LexToken(VAR,'job',1,2645)
 LexToken(EOL,'\n',1,2648)
@@ -105,15 +102,13 @@ LexToken(ASSIGNMENT,'=',1,2719)
 LexToken(VAR,'arg1',1,2720)
 LexToken(DOT,'.',1,2724)
 LexToken(VAR,'model',1,2725)
-LexToken(SEMICOLON,';',1,2730)
-LexToken(EOL,'\n',1,2731)
+LexToken(EOL,'\n',1,2730)
 LexToken(VAR,'graphics',1,2740)
 LexToken(ASSIGNMENT,'=',1,2748)
 LexToken(VAR,'arg1',1,2749)
 LexToken(DOT,'.',1,2753)
 LexToken(VAR,'graphics',1,2754)
-LexToken(SEMICOLON,';',1,2762)
-LexToken(EOL,'\n',1,2763)
+LexToken(EOL,'\n',1,2762)
 LexToken(VAR,'exprs',1,2772)
 LexToken(ASSIGNMENT,'=',1,2777)
 LexToken(VAR,'graphics',1,2778)
@@ -144,8 +139,7 @@ LexToken(NUMBER,'9',1,2853)
 LexToken(CLOSEBRACKET,')',1,2854)
 LexToken(ASSIGNMENT,'=',1,2855)
 LexToken(DQSTRING,'"0"',1,2858)
-LexToken(SEMICOLON,';',1,2859)
-LexToken(EOL,'\n',1,2860)
+LexToken(EOL,'\n',1,2859)
 LexToken(END,'end',1,2869)
 LexToken(EOL,'\n',1,2872)
 LexToken(WHILE,'while',1,2881)
@@ -186,21 +180,21 @@ LexToken(CLOSESQBRACKET,']',1,3042)
 LexToken(COMMA,',',1,3043)
 LexToken(OPENSQBRACKET,'[',1,3059)
 LexToken(DQSTRING,'"input ports sizes"',1,3078)
-LexToken(SEMICOLON,';',1,3079)
+LexToken(SEMICOLON,';\n',1,3079)
 LexToken(DQSTRING,'"output port sizes"',1,3111)
-LexToken(SEMICOLON,';',1,3112)
+LexToken(SEMICOLON,';\n',1,3112)
 LexToken(DQSTRING,'"input event ports sizes"',1,3150)
-LexToken(SEMICOLON,';',1,3151)
+LexToken(SEMICOLON,';\n',1,3151)
 LexToken(DQSTRING,'"output events ports sizes"',1,3191)
-LexToken(SEMICOLON,';',1,3192)
+LexToken(SEMICOLON,';\n',1,3192)
 LexToken(DQSTRING,'"initial continuous state"',1,3231)
-LexToken(SEMICOLON,';',1,3232)
+LexToken(SEMICOLON,';\n',1,3232)
 LexToken(DQSTRING,'"initial discrete state"',1,3269)
-LexToken(SEMICOLON,';',1,3270)
+LexToken(SEMICOLON,';\n',1,3270)
 LexToken(DQSTRING,'"System parameters vector"',1,3309)
-LexToken(SEMICOLON,';',1,3310)
+LexToken(SEMICOLON,';\n',1,3310)
 LexToken(DQSTRING,'"initial firing vector (<0 for no firing)"',1,3365)
-LexToken(SEMICOLON,';',1,3366)
+LexToken(SEMICOLON,';\n',1,3366)
 LexToken(DQSTRING,'"is block always active (0:no, 1:yes)"',1,3417)
 LexToken(CLOSESQBRACKET,']',1,3420)
 LexToken(COMMA,',',1,3421)
@@ -262,8 +256,7 @@ LexToken(VAR,'ok',1,3571)
 LexToken(THEN,'then',1,3574)
 LexToken(EOL,'\n',1,3578)
 LexToken(BREAK,'break',1,3595)
-LexToken(COMMA,',',1,3600)
-LexToken(EOL,'\n',1,3601)
+LexToken(EOL,'\n',1,3600)
 LexToken(END,'end',1,3614)
 LexToken(EOL,'\n',1,3617)
 LexToken(VAR,'exprs',1,3630)
@@ -279,16 +272,14 @@ LexToken(VAR,'xx',1,3658)
 LexToken(OPENBRACKET,'(',1,3660)
 LexToken(COLON,':',1,3661)
 LexToken(CLOSEBRACKET,')',1,3662)
-LexToken(SEMICOLON,';',1,3663)
-LexToken(EOL,'\n',1,3664)
+LexToken(EOL,'\n',1,3663)
 LexToken(VAR,'z',1,3677)
 LexToken(ASSIGNMENT,'=',1,3678)
 LexToken(VAR,'z',1,3679)
 LexToken(OPENBRACKET,'(',1,3680)
 LexToken(COLON,':',1,3681)
 LexToken(CLOSEBRACKET,')',1,3682)
-LexToken(SEMICOLON,';',1,3683)
-LexToken(EOL,'\n',1,3684)
+LexToken(EOL,'\n',1,3683)
 LexToken(VAR,'rpar',1,3697)
 LexToken(ASSIGNMENT,'=',1,3701)
 LexToken(VAR,'rpar',1,3702)
@@ -316,8 +307,7 @@ LexToken(OPENBRACKET,'(',1,3794)
 LexToken(COLON,':',1,3795)
 LexToken(CLOSEBRACKET,')',1,3796)
 LexToken(CLOSEBRACKET,')',1,3797)
-LexToken(SEMICOLON,';',1,3798)
-LexToken(EOL,'\n',1,3799)
+LexToken(EOL,'\n',1,3798)
 LexToken(VAR,'ni',1,3812)
 LexToken(ASSIGNMENT,'=',1,3814)
 LexToken(VAR,'size',1,3815)
@@ -326,8 +316,7 @@ LexToken(VAR,'i',1,3820)
 LexToken(COMMA,',',1,3821)
 LexToken(NUMBER,'1',1,3822)
 LexToken(CLOSEBRACKET,')',1,3823)
-LexToken(SEMICOLON,';',1,3824)
-LexToken(EOL,'\n',1,3825)
+LexToken(EOL,'\n',1,3824)
 LexToken(VAR,'o',1,3838)
 LexToken(ASSIGNMENT,'=',1,3839)
 LexToken(VAR,'int',1,3840)
@@ -337,8 +326,7 @@ LexToken(OPENBRACKET,'(',1,3845)
 LexToken(COLON,':',1,3846)
 LexToken(CLOSEBRACKET,')',1,3847)
 LexToken(CLOSEBRACKET,')',1,3848)
-LexToken(SEMICOLON,';',1,3849)
-LexToken(EOL,'\n',1,3850)
+LexToken(EOL,'\n',1,3849)
 LexToken(VAR,'no',1,3863)
 LexToken(ASSIGNMENT,'=',1,3865)
 LexToken(VAR,'size',1,3866)
@@ -347,8 +335,7 @@ LexToken(VAR,'o',1,3871)
 LexToken(COMMA,',',1,3872)
 LexToken(NUMBER,'1',1,3873)
 LexToken(CLOSEBRACKET,')',1,3874)
-LexToken(SEMICOLON,';',1,3875)
-LexToken(EOL,'\n',1,3876)
+LexToken(EOL,'\n',1,3875)
 LexToken(VAR,'ci',1,3889)
 LexToken(ASSIGNMENT,'=',1,3891)
 LexToken(VAR,'int',1,3892)
@@ -358,8 +345,7 @@ LexToken(OPENBRACKET,'(',1,3898)
 LexToken(COLON,':',1,3899)
 LexToken(CLOSEBRACKET,')',1,3900)
 LexToken(CLOSEBRACKET,')',1,3901)
-LexToken(SEMICOLON,';',1,3902)
-LexToken(EOL,'\n',1,3903)
+LexToken(EOL,'\n',1,3902)
 LexToken(VAR,'nci',1,3916)
 LexToken(ASSIGNMENT,'=',1,3919)
 LexToken(VAR,'size',1,3920)
@@ -368,8 +354,7 @@ LexToken(VAR,'ci',1,3925)
 LexToken(COMMA,',',1,3927)
 LexToken(NUMBER,'1',1,3928)
 LexToken(CLOSEBRACKET,')',1,3929)
-LexToken(SEMICOLON,';',1,3930)
-LexToken(EOL,'\n',1,3931)
+LexToken(EOL,'\n',1,3930)
 LexToken(VAR,'co',1,3944)
 LexToken(ASSIGNMENT,'=',1,3946)
 LexToken(VAR,'int',1,3947)
@@ -379,8 +364,7 @@ LexToken(OPENBRACKET,'(',1,3953)
 LexToken(COLON,':',1,3954)
 LexToken(CLOSEBRACKET,')',1,3955)
 LexToken(CLOSEBRACKET,')',1,3956)
-LexToken(SEMICOLON,';',1,3957)
-LexToken(EOL,'\n',1,3958)
+LexToken(EOL,'\n',1,3957)
 LexToken(VAR,'nco',1,3971)
 LexToken(ASSIGNMENT,'=',1,3974)
 LexToken(VAR,'size',1,3975)
@@ -389,8 +373,7 @@ LexToken(VAR,'co',1,3980)
 LexToken(COMMA,',',1,3982)
 LexToken(NUMBER,'1',1,3983)
 LexToken(CLOSEBRACKET,')',1,3984)
-LexToken(SEMICOLON,';',1,3985)
-LexToken(EOL,'\n',1,3986)
+LexToken(EOL,'\n',1,3985)
 LexToken(OPENSQBRACKET,'[',1,3999)
 LexToken(VAR,'ok',1,4000)
 LexToken(COMMA,',',1,4002)
@@ -450,8 +433,7 @@ LexToken(VAR,'ok',1,4140)
 LexToken(THEN,'then',1,4143)
 LexToken(EOL,'\n',1,4147)
 LexToken(BREAK,'break',1,4164)
-LexToken(COMMA,',',1,4169)
-LexToken(EOL,'\n',1,4170)
+LexToken(EOL,'\n',1,4169)
 LexToken(END,'end',1,4183)
 LexToken(EOL,'\n',1,4186)
 LexToken(OPENSQBRACKET,'[',1,4199)
@@ -518,15 +500,13 @@ LexToken(ASSIGNMENT,'=',1,4468)
 LexToken(VAR,'model',1,4469)
 LexToken(DOT,'.',1,4474)
 LexToken(VAR,'ipar',1,4475)
-LexToken(SEMICOLON,';',1,4479)
-LexToken(EOL,'\n',1,4480)
+LexToken(EOL,'\n',1,4479)
 LexToken(VAR,'model',1,4501)
 LexToken(DOT,'.',1,4506)
 LexToken(VAR,'ipar',1,4507)
 LexToken(ASSIGNMENT,'=',1,4511)
 LexToken(NUMBER,'0',1,4512)
-LexToken(SEMICOLON,';',1,4513)
-LexToken(EOL,'\n',1,4514)
+LexToken(EOL,'\n',1,4513)
 LexToken(END,'end',1,4531)
 LexToken(EOL,'\n',1,4534)
 LexToken(IF,'if',1,4551)
@@ -543,8 +523,7 @@ LexToken(EOL,'\n',1,4577)
 LexToken(VAR,'needcompile',1,4598)
 LexToken(ASSIGNMENT,'=',1,4609)
 LexToken(NUMBER,'4',1,4610)
-LexToken(COMMA,',',1,4611)
-LexToken(EOL,'\n',1,4612)
+LexToken(EOL,'\n',1,4611)
 LexToken(END,'end',1,4629)
 LexToken(EOL,'\n',1,4632)
 LexToken(VAR,'model',1,4649)
@@ -769,7 +748,7 @@ LexToken(VAR,'sci2exp',1,5539)
 LexToken(OPENBRACKET,'(',1,5546)
 LexToken(VAR,'clkout',1,5547)
 LexToken(CLOSEBRACKET,')',1,5553)
-LexToken(SEMICOLON,';',1,5554)
+LexToken(SEMICOLON,';\n',1,5554)
 LexToken(VAR,'strcat',1,5564)
 LexToken(OPENBRACKET,'(',1,5570)
 LexToken(VAR,'sci2exp',1,5571)
@@ -785,7 +764,7 @@ LexToken(OPENBRACKET,'(',1,5598)
 LexToken(VAR,'z0',1,5599)
 LexToken(CLOSEBRACKET,')',1,5601)
 LexToken(CLOSEBRACKET,')',1,5602)
-LexToken(SEMICOLON,';',1,5603)
+LexToken(SEMICOLON,';\n',1,5603)
 LexToken(VAR,'strcat',1,5613)
 LexToken(OPENBRACKET,'(',1,5619)
 LexToken(VAR,'sci2exp',1,5620)