ignore comma and semicolon after comment at the end of line

21 files changed, 16 insertions, 65 deletions

diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index 24a9dc32..b439baf5 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -195,7 +195,6 @@ LexToken(DOT,'.',1,1635)
 LexToken(VAR,'exprs',1,1636)
 LexToken(ASSIGNMENT,'=',1,1641)
 LexToken(VAR,'exprs',1,1642)
-LexToken(SEMICOLON,';',1,1647)
 LexToken(EOL,'\n',1,1676)
 LexToken(VAR,'x',1,1693)
 LexToken(DOT,'.',1,1694)
diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js
index 1c65cfaf..51b3450e 100644
--- a/js/Events/IFTHEL_f.js
+++ b/js/Events/IFTHEL_f.js
@@ -175,7 +175,6 @@ LexToken(OPENSQBRACKET,'[',1,1484)
 LexToken(PREVAR_BOOLEAN,'%t',1,1485)
 LexToken(PREVAR_BOOLEAN,'%f',1,1488)
 LexToken(CLOSESQBRACKET,']',1,1490)
-LexToken(SEMICOLON,';',1,1491)
 LexToken(EOL,'\n',1,1509)
 LexToken(IF,'if',1,1522)
 LexToken(VAR,'nmod',1,1525)
diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js
index 24598bc0..4dad8502 100644
--- a/js/Linear/CLR.js
+++ b/js/Linear/CLR.js
@@ -114,7 +114,6 @@ LexToken(EOL,'\n',1,1117)
 LexToken(PREVAR,'%scicos_context',1,1126)
 LexToken(ASSIGNMENT,'=',1,1141)
 LexToken(PREVAR,'%scicos_context',1,1142)
-LexToken(SEMICOLON,';',1,1157)
 LexToken(EOL,'\n',1,1198)
 LexToken(PREVAR,'%scicos_context',1,1207)
 LexToken(DOT,'.',1,1222)
diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js
index 74ed8feb..908fe0b1 100644
--- a/js/Linear/CLR_f.js
+++ b/js/Linear/CLR_f.js
@@ -114,7 +114,6 @@ LexToken(EOL,'\n',1,1146)
 LexToken(PREVAR,'%scicos_context',1,1155)
 LexToken(ASSIGNMENT,'=',1,1170)
 LexToken(PREVAR,'%scicos_context',1,1171)
-LexToken(SEMICOLON,';',1,1186)
 LexToken(EOL,'\n',1,1227)
 LexToken(PREVAR,'%scicos_context',1,1236)
 LexToken(DOT,'.',1,1251)
diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js
index 47db18d8..90232eec 100644
--- a/js/Linear/DLR.js
+++ b/js/Linear/DLR.js
@@ -100,7 +100,6 @@ LexToken(EOL,'\n',1,1091)
 LexToken(PREVAR,'%scicos_context',1,1101)
 LexToken(ASSIGNMENT,'=',1,1116)
 LexToken(PREVAR,'%scicos_context',1,1117)
-LexToken(SEMICOLON,';',1,1132)
 LexToken(EOL,'\n',1,1173)
 LexToken(PREVAR,'%scicos_context',1,1182)
 LexToken(DOT,'.',1,1197)
diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js
index 82bb1c97..79e2bad8 100644
--- a/js/Linear/DLR_f.js
+++ b/js/Linear/DLR_f.js
@@ -100,7 +100,6 @@ LexToken(EOL,'\n',1,1093)
 LexToken(PREVAR,'%scicos_context',1,1103)
 LexToken(ASSIGNMENT,'=',1,1118)
 LexToken(PREVAR,'%scicos_context',1,1119)
-LexToken(SEMICOLON,';',1,1134)
 LexToken(EOL,'\n',1,1175)
 LexToken(PREVAR,'%scicos_context',1,1184)
 LexToken(DOT,'.',1,1199)
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js
index c961f221..fbc52721 100644
--- a/js/Misc/AUTOMAT.js
+++ b/js/Misc/AUTOMAT.js
@@ -230,7 +230,6 @@ LexToken(DQSTRING,'"*"',1,2128)
 LexToken(CLOSEBRACKET,')',1,2129)
 LexToken(ADDITION,'-',1,2130)
 LexToken(NUMBER,'5',1,2131)
-LexToken(SEMICOLON,';',1,2132)
 LexToken(EOL,'\n',1,2162)
 LexToken(VAR,'ModifEncore',1,2175)
 LexToken(ASSIGNMENT,'=',1,2186)
@@ -258,7 +257,6 @@ LexToken(CLOSEBRACKET,')',1,2271)
 LexToken(ASSIGNMENT,'=',1,2272)
 LexToken(OPENSQBRACKET,'[',1,2273)
 LexToken(CLOSESQBRACKET,']',1,2274)
-LexToken(SEMICOLON,';',1,2275)
 LexToken(EOL,'\n',1,2295)
 LexToken(VAR,'ModifEncore',1,2312)
 LexToken(ASSIGNMENT,'=',1,2323)
@@ -291,7 +289,6 @@ LexToken(VAR,'NMode_old',1,2431)
 LexToken(ADDITION,'+',1,2440)
 LexToken(NUMBER,'4',1,2441)
 LexToken(CLOSEBRACKET,')',1,2442)
-LexToken(SEMICOLON,';',1,2443)
 LexToken(EOL,'\n',1,2463)
 LexToken(VAR,'ModifEncore',1,2480)
 LexToken(ASSIGNMENT,'=',1,2491)
@@ -433,7 +430,6 @@ LexToken(COMMA,',',1,3220)
 LexToken(COLON,':',1,3221)
 LexToken(CLOSEBRACKET,')',1,3222)
 LexToken(CLOSESQBRACKET,']',1,3223)
-LexToken(SEMICOLON,';',1,3224)
 LexToken(EOL,'\n',1,3262)
 LexToken(END,'end',1,3279)
 LexToken(EOL,'\n',1,3282)
@@ -466,7 +462,6 @@ LexToken(VAR,'NX',1,3390)
 LexToken(COMMA,',',1,3392)
 LexToken(NUMBER,'1',1,3393)
 LexToken(CLOSEBRACKET,')',1,3394)
-LexToken(SEMICOLON,';',1,3395)
 LexToken(EOL,'\n',1,3444)
 LexToken(VAR,'ipar',1,3461)
 LexToken(ASSIGNMENT,'=',1,3465)
@@ -490,7 +485,6 @@ LexToken(VAR,'NX',1,3521)
 LexToken(COMMA,',',1,3523)
 LexToken(NUMBER,'1',1,3524)
 LexToken(CLOSEBRACKET,')',1,3525)
-LexToken(SEMICOLON,';',1,3526)
 LexToken(EOL,'\n',1,3556)
 LexToken(VAR,'INP',1,3573)
 LexToken(ASSIGNMENT,'=',1,3576)
@@ -553,7 +547,6 @@ LexToken(ADDITION,'+',1,3846)
 LexToken(VAR,'i',1,3847)
 LexToken(CLOSEBRACKET,')',1,3848)
 LexToken(CLOSEBRACKET,')',1,3849)
-LexToken(SEMICOLON,';',1,3850)
 LexToken(EOL,'\n',1,3870)
 LexToken(VAR,'ipar',1,3891)
 LexToken(ASSIGNMENT,'=',1,3895)
@@ -813,7 +806,6 @@ LexToken(EOL,'\n',1,5319)
 LexToken(END,'end',1,5332)
 LexToken(EOL,'\n',1,5335)
 LexToken(END,'end',1,5344)
-LexToken(SEMICOLON,';',1,5347)
 LexToken(EOL,'\n',1,5355)
 LexToken(EOL,'\n',1,5413)
 LexToken(CASE,'case',1,5418)
@@ -823,17 +815,14 @@ LexToken(EOL,'\n',1,5436)
 LexToken(VAR,'NMode',1,5445)
 LexToken(ASSIGNMENT,'=',1,5450)
 LexToken(NUMBER,'2',1,5451)
-LexToken(SEMICOLON,';',1,5452)
 LexToken(EOL,'\n',1,5471)
 LexToken(VAR,'Minitial',1,5480)
 LexToken(ASSIGNMENT,'=',1,5488)
 LexToken(NUMBER,'1',1,5489)
-LexToken(SEMICOLON,';',1,5490)
 LexToken(EOL,'\n',1,5506)
 LexToken(VAR,'NX',1,5515)
 LexToken(ASSIGNMENT,'=',1,5517)
 LexToken(NUMBER,'1',1,5518)
-LexToken(SEMICOLON,';',1,5519)
 LexToken(EOL,'\n',1,5571)
 LexToken(VAR,'X0',1,5580)
 LexToken(ASSIGNMENT,'=',1,5582)
@@ -854,7 +843,6 @@ LexToken(ASSIGNMENT,'=',1,5643)
 LexToken(OPENSQBRACKET,'[',1,5644)
 LexToken(NUMBER,'2',1,5645)
 LexToken(CLOSESQBRACKET,']',1,5646)
-LexToken(SEMICOLON,';',1,5647)
 LexToken(EOL,'\n',1,5688)
 LexToken(VAR,'C2',1,5697)
 LexToken(ASSIGNMENT,'=',1,5699)
@@ -958,7 +946,6 @@ LexToken(VAR,'NX',1,5971)
 LexToken(ADDITION,'+',1,5973)
 LexToken(NUMBER,'1',1,5974)
 LexToken(CLOSESQBRACKET,']',1,5975)
-LexToken(SEMICOLON,';',1,5976)
 LexToken(EOL,'\n',1,5994)
 LexToken(VAR,'model',1,6003)
 LexToken(DOT,'.',1,6008)
@@ -971,7 +958,6 @@ LexToken(NUMBER,'2',1,6016)
 LexToken(MULTIPLICATION,'*',1,6017)
 LexToken(VAR,'NX',1,6018)
 LexToken(CLOSESQBRACKET,']',1,6020)
-LexToken(SEMICOLON,';',1,6021)
 LexToken(EOL,'\n',1,6038)
 LexToken(VAR,'model',1,6047)
 LexToken(DOT,'.',1,6052)
@@ -985,14 +971,12 @@ LexToken(VAR,'NX',1,6066)
 LexToken(COMMA,',',1,6068)
 LexToken(NUMBER,'1',1,6069)
 LexToken(CLOSEBRACKET,')',1,6070)
-LexToken(SEMICOLON,';',1,6071)
 LexToken(EOL,'\n',1,6081)
 LexToken(VAR,'model',1,6090)
 LexToken(DOT,'.',1,6095)
 LexToken(VAR,'nzcross',1,6096)
 LexToken(ASSIGNMENT,'=',1,6103)
 LexToken(NUMBER,'1',1,6104)
-LexToken(SEMICOLON,';',1,6105)
 LexToken(EOL,'\n',1,6131)
 LexToken(VAR,'model',1,6140)
 LexToken(DOT,'.',1,6145)
diff --git a/js/Misc/EXPRESSION.js b/js/Misc/EXPRESSION.js
index f75c886a..6fa00278 100644
--- a/js/Misc/EXPRESSION.js
+++ b/js/Misc/EXPRESSION.js
@@ -838,7 +838,6 @@ LexToken(SEMICOLON,';\n',1,4882)
 LexToken(DQSTRING,'"log10"',1,4894)
 LexToken(SEMICOLON,';\n',1,4895)
 LexToken(CLOSESQBRACKET,']',1,4901)
-LexToken(SEMICOLON,';',1,4902)
 LexToken(EOL,'\n',1,4920)
 LexToken(PREVAR,'%num_arg',1,4925)
 LexToken(ASSIGNMENT,'=',1,4933)
@@ -890,7 +889,6 @@ LexToken(NUMBER,'2',1,5003)
 LexToken(SEMICOLON,';\n',1,5004)
 LexToken(NUMBER,'1',1,5010)
 LexToken(CLOSESQBRACKET,']',1,5016)
-LexToken(SEMICOLON,';',1,5017)
 LexToken(EOL,'\n',1,5041)
 LexToken(PREVAR,'%ZCR',1,5046)
 LexToken(ASSIGNMENT,'=',1,5050)
@@ -929,7 +927,6 @@ LexToken(NUMBER,'115',1,5103)
 LexToken(COMMA,',',1,5106)
 LexToken(NUMBER,'116',1,5107)
 LexToken(CLOSESQBRACKET,']',1,5110)
-LexToken(SEMICOLON,';',1,5111)
 LexToken(EOL,'\n',1,5139)
 LexToken(PREVAR,'%UU',1,5144)
 LexToken(ASSIGNMENT,'=',1,5147)
diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js
index 212275cc..8de360d4 100644
--- a/js/Misc/MBLOCK.js
+++ b/js/Misc/MBLOCK.js
@@ -1852,7 +1852,6 @@ LexToken(VAR,'lab_2',1,14520)
 LexToken(OPENBRACKET,'(',1,14525)
 LexToken(VAR,'i',1,14526)
 LexToken(CLOSEBRACKET,')',1,14527)
-LexToken(SEMICOLON,';',1,14528)
 LexToken(EOL,'\n',1,14537)
 LexToken(END,'end',1,14562)
 LexToken(EOL,'\n',1,14565)
diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js
index ac018296..e2a81e16 100644
--- a/js/Misc/MPBLOCK.js
+++ b/js/Misc/MPBLOCK.js
@@ -1747,7 +1747,6 @@ LexToken(VAR,'lab_2',1,14002)
 LexToken(OPENBRACKET,'(',1,14007)
 LexToken(VAR,'i',1,14008)
 LexToken(CLOSEBRACKET,')',1,14009)
-LexToken(SEMICOLON,';',1,14010)
 LexToken(EOL,'\n',1,14019)
 LexToken(END,'end',1,14044)
 LexToken(EOL,'\n',1,14047)
diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js
index 4ae265ee..2ea552f5 100644
--- a/js/Misc/RELATIONALOP.js
+++ b/js/Misc/RELATIONALOP.js
@@ -472,7 +472,6 @@ LexToken(EOL,'\n',1,2979)
 LexToken(VAR,'label',1,3000)
 LexToken(ASSIGNMENT,'=',1,3006)
 LexToken(DQSTRING,'"<"',1,3014)
-LexToken(SEMICOLON,';',1,3015)
 LexToken(EOL,'\n',1,3021)
 LexToken(ELSEIF,'elseif',1,3038)
 LexToken(VAR,'rule',1,3045)
@@ -483,7 +482,6 @@ LexToken(EOL,'\n',1,3059)
 LexToken(VAR,'label',1,3080)
 LexToken(ASSIGNMENT,'=',1,3086)
 LexToken(DQSTRING,'"≤"',1,3096)
-LexToken(SEMICOLON,';',1,3097)
 LexToken(EOL,'\n',1,3104)
 LexToken(ELSEIF,'elseif',1,3121)
 LexToken(VAR,'rule',1,3128)
@@ -494,7 +492,6 @@ LexToken(EOL,'\n',1,3142)
 LexToken(VAR,'label',1,3163)
 LexToken(ASSIGNMENT,'=',1,3169)
 LexToken(DQSTRING,'">"',1,3177)
-LexToken(SEMICOLON,';',1,3178)
 LexToken(EOL,'\n',1,3184)
 LexToken(ELSEIF,'elseif',1,3201)
 LexToken(VAR,'rule',1,3208)
@@ -505,7 +502,6 @@ LexToken(EOL,'\n',1,3222)
 LexToken(VAR,'label',1,3243)
 LexToken(ASSIGNMENT,'=',1,3249)
 LexToken(DQSTRING,'"≥"',1,3259)
-LexToken(SEMICOLON,';',1,3260)
 LexToken(EOL,'\n',1,3267)
 LexToken(END,'end',1,3284)
 LexToken(EOL,'\n',1,3287)
diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js
index 94ed7a05..62caaf46 100644
--- a/js/Misc/TEXT_f.js
+++ b/js/Misc/TEXT_f.js
@@ -231,7 +231,6 @@ LexToken(ASSIGNMENT,'=',1,2022)
 LexToken(VAR,'gca',1,2024)
 LexToken(OPENBRACKET,'(',1,2027)
 LexToken(CLOSEBRACKET,')',1,2028)
-LexToken(SEMICOLON,';',1,2029)
 LexToken(EOL,'\n',1,2068)
 LexToken(VAR,'default_font_style',1,2085)
 LexToken(ASSIGNMENT,'=',1,2104)
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index 6e9a0dfc..ba5906b1 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -235,7 +235,6 @@ LexToken(NUMBER,'5',1,2010)
 LexToken(CLOSEBRACKET,')',1,2011)
 LexToken(ASSIGNMENT,'=',1,2012)
 LexToken(DQSTRING,'"n"',1,2015)
-LexToken(SEMICOLON,';',1,2016)
 LexToken(EOL,'\n',1,2034)
 LexToken(VAR,'exprs',1,2047)
 LexToken(OPENBRACKET,'(',1,2052)
@@ -246,7 +245,6 @@ LexToken(VAR,'sci2exp',1,2056)
 LexToken(OPENBRACKET,'(',1,2063)
 LexToken(VAR,'mtd',1,2064)
 LexToken(CLOSEBRACKET,')',1,2067)
-LexToken(SEMICOLON,';',1,2068)
 LexToken(EOL,'\n',1,2104)
 LexToken(EOL,'\n',1,2105)
 LexToken(VAR,'METHOD',1,2118)
@@ -804,7 +802,6 @@ LexToken(VAR,'size',1,4535)
 LexToken(OPENBRACKET,'(',1,4539)
 LexToken(VAR,'xx',1,4540)
 LexToken(CLOSEBRACKET,')',1,4542)
-LexToken(SEMICOLON,';',1,4543)
 LexToken(EOL,'\n',1,4573)
 LexToken(EOL,'\n',1,4574)
 LexToken(FOR,'for',1,4579)
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index 3d15351d..7d402e4c 100644
--- a/js/NonLinear/LOOKUP_c.js
+++ b/js/NonLinear/LOOKUP_c.js
@@ -368,7 +368,6 @@ LexToken(VAR,'cleandata',1,2743)
 LexToken(OPENBRACKET,'(',1,2752)
 LexToken(VAR,'xy',1,2753)
 LexToken(CLOSEBRACKET,')',1,2755)
-LexToken(SEMICOLON,';',1,2756)
 LexToken(EOL,'\n',1,2834)
 LexToken(VAR,'N',1,2851)
 LexToken(ASSIGNMENT,'=',1,2852)
@@ -385,7 +384,6 @@ LexToken(NUMBER,'5',1,2890)
 LexToken(CLOSEBRACKET,')',1,2891)
 LexToken(ASSIGNMENT,'=',1,2892)
 LexToken(DQSTRING,'"n"',1,2895)
-LexToken(SEMICOLON,';',1,2896)
 LexToken(EOL,'\n',1,2914)
 LexToken(IF,'if',1,2931)
 LexToken(VAR,'graf',1,2934)
@@ -480,7 +478,6 @@ LexToken(EOL,'\n',1,3436)
 LexToken(BREAK,'break',1,3461)
 LexToken(EOL,'\n',1,3466)
 LexToken(END,'end',1,3488)
-LexToken(SEMICOLON,';',1,3491)
 LexToken(EOL,'\n',1,3513)
 LexToken(EOL,'\n',1,3514)
 LexToken(EOL,'\n',1,3563)
@@ -882,7 +879,6 @@ LexToken(VAR,'sci2exp',1,5415)
 LexToken(OPENBRACKET,'(',1,5422)
 LexToken(VAR,'mtd',1,5423)
 LexToken(CLOSEBRACKET,')',1,5426)
-LexToken(SEMICOLON,';',1,5427)
 LexToken(EOL,'\n',1,5463)
 LexToken(VAR,'oipar',1,5484)
 LexToken(ASSIGNMENT,'=',1,5489)
@@ -948,7 +944,6 @@ LexToken(OPENBRACKET,'(',1,5849)
 LexToken(NUMBER,'1',1,5850)
 LexToken(CLOSEBRACKET,')',1,5851)
 LexToken(CLOSEBRACKET,')',1,5852)
-LexToken(SEMICOLON,';',1,5853)
 LexToken(EOL,'\n',1,5877)
 LexToken(ELSE,'else',1,5894)
 LexToken(EOL,'\n',1,5898)
@@ -2493,7 +2488,6 @@ LexToken(ADDITION,'-',1,11904)
 LexToken(NUMBER,'1',1,11905)
 LexToken(CLOSESQBRACKET,']',1,11906)
 LexToken(CLOSEBRACKET,')',1,11907)
-LexToken(SEMICOLON,';',1,11908)
 LexToken(EOL,'\n',1,11925)
 LexToken(VAR,'xpolys',1,11930)
 LexToken(OPENBRACKET,'(',1,11936)
@@ -2515,7 +2509,6 @@ LexToken(OPENSQBRACKET,'[',1,11953)
 LexToken(NUMBER,'5',1,11954)
 LexToken(CLOSESQBRACKET,']',1,11955)
 LexToken(CLOSEBRACKET,')',1,11956)
-LexToken(SEMICOLON,';',1,11957)
 LexToken(EOL,'\n',1,11975)
 LexToken(VAR,'splines',1,11980)
 LexToken(ASSIGNMENT,'=',1,11987)
@@ -5113,7 +5106,6 @@ LexToken(VAR,'xy',1,25861)
 LexToken(COMMA,',',1,25863)
 LexToken(DQSTRING,'"r"',1,25866)
 LexToken(CLOSEBRACKET,')',1,25867)
-LexToken(SEMICOLON,';',1,25868)
 LexToken(EOL,'\n',1,25886)
 LexToken(VAR,'x',1,25891)
 LexToken(ASSIGNMENT,'=',1,25892)
@@ -7001,7 +6993,6 @@ LexToken(VAR,'size',1,32180)
 LexToken(OPENBRACKET,'(',1,32184)
 LexToken(VAR,'xo',1,32185)
 LexToken(CLOSEBRACKET,')',1,32187)
-LexToken(SEMICOLON,';',1,32188)
 LexToken(EOL,'\n',1,32218)
 LexToken(OPENSQBRACKET,'[',1,32231)
 LexToken(VAR,'ny',1,32232)
@@ -7126,7 +7117,6 @@ LexToken(VAR,'size',1,32721)
 LexToken(OPENBRACKET,'(',1,32725)
 LexToken(VAR,'xe',1,32726)
 LexToken(CLOSEBRACKET,')',1,32728)
-LexToken(SEMICOLON,';',1,32729)
 LexToken(EOL,'\n',1,32759)
 LexToken(OPENSQBRACKET,'[',1,32764)
 LexToken(VAR,'ny',1,32765)
@@ -8642,7 +8632,6 @@ LexToken(NUMBER,'2',1,38071)
 LexToken(CLOSEBRACKET,')',1,38072)
 LexToken(TRANSPOSE,"'",1,38073)
 LexToken(CLOSESQBRACKET,']',1,38074)
-LexToken(SEMICOLON,';',1,38075)
 LexToken(EOL,'\n',1,38119)
 LexToken(END,'end',1,38124)
 LexToken(EOL,'\n',1,38127)
diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js
index c27f2d8a..67f3fdb0 100644
--- a/js/Sinks/AFFICH_m.js
+++ b/js/Sinks/AFFICH_m.js
@@ -185,7 +185,6 @@ LexToken(VAR,'mess',1,1809)
 LexToken(ASSIGNMENT,'=',1,1814)
 LexToken(OPENSQBRACKET,'[',1,1816)
 LexToken(CLOSESQBRACKET,']',1,1817)
-LexToken(SEMICOLON,';',1,1819)
 LexToken(EOL,'\n',1,1836)
 LexToken(EOL,'\n',1,1837)
 LexToken(IF,'if',1,1850)
diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js
index 70bc3c8c..6821a46f 100644
--- a/js/Sinks/CSCOPE.js
+++ b/js/Sinks/CSCOPE.js
@@ -807,7 +807,6 @@ LexToken(VAR,'emptystr',1,4531)
 LexToken(OPENBRACKET,'(',1,4539)
 LexToken(CLOSEBRACKET,')',1,4540)
 LexToken(CLOSESQBRACKET,']',1,4541)
-LexToken(SEMICOLON,';',1,4542)
 LexToken(EOL,'\n',1,4554)
 LexToken(VAR,'gr_i',1,4563)
 LexToken(ASSIGNMENT,'=',1,4567)
diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js
index 7ffe05dd..8c7e3973 100644
--- a/js/Sources/CURVE_c.js
+++ b/js/Sources/CURVE_c.js
@@ -346,7 +346,6 @@ LexToken(VAR,'cleandata',1,2558)
 LexToken(OPENBRACKET,'(',1,2567)
 LexToken(VAR,'xy',1,2568)
 LexToken(CLOSEBRACKET,')',1,2570)
-LexToken(SEMICOLON,';',1,2571)
 LexToken(EOL,'\n',1,2650)
 LexToken(VAR,'N',1,2667)
 LexToken(ASSIGNMENT,'=',1,2668)
@@ -363,7 +362,6 @@ LexToken(NUMBER,'5',1,2706)
 LexToken(CLOSEBRACKET,')',1,2707)
 LexToken(ASSIGNMENT,'=',1,2708)
 LexToken(DQSTRING,'"n"',1,2711)
-LexToken(SEMICOLON,';',1,2712)
 LexToken(EOL,'\n',1,2730)
 LexToken(EOL,'\n',1,2731)
 LexToken(IF,'if',1,2748)
@@ -419,7 +417,6 @@ LexToken(CLOSEBRACKET,')',1,3030)
 LexToken(CLOSEBRACKET,')',1,3031)
 LexToken(ADDITION,'+',1,3032)
 LexToken(NUMBER,'1',1,3033)
-LexToken(SEMICOLON,';',1,3034)
 LexToken(EOL,'\n',1,3064)
 LexToken(END,'end',1,3085)
 LexToken(EOL,'\n',1,3088)
@@ -440,7 +437,6 @@ LexToken(VAR,'ipar',1,3235)
 LexToken(COMMA,',',1,3239)
 LexToken(VAR,'rpar',1,3240)
 LexToken(CLOSEBRACKET,')',1,3244)
-LexToken(SEMICOLON,';',1,3245)
 LexToken(EOL,'\n',1,3299)
 LexToken(IF,'if',1,3320)
 LexToken(NOT,'~',1,3323)
@@ -450,7 +446,6 @@ LexToken(EOL,'\n',1,3331)
 LexToken(BREAK,'break',1,3356)
 LexToken(EOL,'\n',1,3361)
 LexToken(END,'end',1,3383)
-LexToken(SEMICOLON,';',1,3386)
 LexToken(EOL,'\n',1,3408)
 LexToken(EOL,'\n',1,3409)
 LexToken(EOL,'\n',1,3458)
@@ -822,7 +817,6 @@ LexToken(VAR,'sci2exp',1,5214)
 LexToken(OPENBRACKET,'(',1,5221)
 LexToken(VAR,'mtd',1,5222)
 LexToken(CLOSEBRACKET,')',1,5225)
-LexToken(SEMICOLON,';',1,5226)
 LexToken(EOL,'\n',1,5262)
 LexToken(VAR,'oipar',1,5283)
 LexToken(ASSIGNMENT,'=',1,5288)
@@ -886,7 +880,6 @@ LexToken(OPENBRACKET,'(',1,5640)
 LexToken(NUMBER,'1',1,5641)
 LexToken(CLOSEBRACKET,')',1,5642)
 LexToken(CLOSEBRACKET,')',1,5643)
-LexToken(SEMICOLON,';',1,5644)
 LexToken(EOL,'\n',1,5668)
 LexToken(ELSE,'else',1,5685)
 LexToken(EOL,'\n',1,5689)
@@ -2277,7 +2270,6 @@ LexToken(ADDITION,'-',1,11145)
 LexToken(NUMBER,'1',1,11146)
 LexToken(CLOSESQBRACKET,']',1,11147)
 LexToken(CLOSEBRACKET,')',1,11148)
-LexToken(SEMICOLON,';',1,11149)
 LexToken(EOL,'\n',1,11166)
 LexToken(VAR,'xpolys',1,11171)
 LexToken(OPENBRACKET,'(',1,11177)
@@ -2299,7 +2291,6 @@ LexToken(OPENSQBRACKET,'[',1,11194)
 LexToken(NUMBER,'5',1,11195)
 LexToken(CLOSESQBRACKET,']',1,11196)
 LexToken(CLOSEBRACKET,')',1,11197)
-LexToken(SEMICOLON,';',1,11198)
 LexToken(EOL,'\n',1,11216)
 LexToken(VAR,'splines',1,11221)
 LexToken(ASSIGNMENT,'=',1,11229)
@@ -2380,7 +2371,6 @@ LexToken(ASSIGNMENT,'=',1,11563)
 LexToken(VAR,'get_click',1,11565)
 LexToken(OPENBRACKET,'(',1,11574)
 LexToken(CLOSEBRACKET,')',1,11575)
-LexToken(SEMICOLON,';',1,11576)
 LexToken(EOL,'\n',1,11586)
 LexToken(IF,'if',1,11595)
 LexToken(OPENBRACKET,'(',1,11598)
@@ -4961,7 +4951,6 @@ LexToken(VAR,'xy',1,25161)
 LexToken(COMMA,',',1,25163)
 LexToken(DQSTRING,'"r"',1,25166)
 LexToken(CLOSEBRACKET,')',1,25167)
-LexToken(SEMICOLON,';',1,25168)
 LexToken(EOL,'\n',1,25186)
 LexToken(VAR,'x',1,25191)
 LexToken(ASSIGNMENT,'=',1,25192)
@@ -6960,7 +6949,6 @@ LexToken(VAR,'size',1,31819)
 LexToken(OPENBRACKET,'(',1,31823)
 LexToken(VAR,'xo',1,31824)
 LexToken(CLOSEBRACKET,')',1,31826)
-LexToken(SEMICOLON,';',1,31827)
 LexToken(EOL,'\n',1,31857)
 LexToken(OPENSQBRACKET,'[',1,31870)
 LexToken(VAR,'ny',1,31871)
@@ -7087,7 +7075,6 @@ LexToken(VAR,'size',1,32379)
 LexToken(OPENBRACKET,'(',1,32383)
 LexToken(VAR,'xe',1,32384)
 LexToken(CLOSEBRACKET,')',1,32386)
-LexToken(SEMICOLON,';',1,32387)
 LexToken(EOL,'\n',1,32417)
 LexToken(OPENSQBRACKET,'[',1,32422)
 LexToken(VAR,'ny',1,32423)
@@ -8236,7 +8223,6 @@ LexToken(NUMBER,'2',1,36967)
 LexToken(CLOSEBRACKET,')',1,36968)
 LexToken(TRANSPOSE,"'",1,36969)
 LexToken(CLOSESQBRACKET,']',1,36970)
-LexToken(SEMICOLON,';',1,36971)
 LexToken(EOL,'\n',1,37015)
 LexToken(END,'end',1,37020)
 LexToken(EOL,'\n',1,37023)
diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js
index fee2045a..80fc54f8 100644
--- a/js/Sources/FROMWS_c.js
+++ b/js/Sources/FROMWS_c.js
@@ -368,7 +368,6 @@ LexToken(EOL,'\n',1,2689)
 LexToken(VAR,'varnam',1,2698)
 LexToken(ASSIGNMENT,'=',1,2704)
 LexToken(DQSTRING,'"V"',1,2707)
-LexToken(SEMICOLON,';',1,2708)
 LexToken(EOL,'\n',1,2732)
 LexToken(VAR,'Method',1,2741)
 LexToken(ASSIGNMENT,'=',1,2747)
diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js
index 4d32e4be..8db9a140 100644
--- a/js/Sources/Sigbuilder.js
+++ b/js/Sources/Sigbuilder.js
@@ -2441,7 +2441,6 @@ LexToken(NUMBER,'2',1,11064)
 LexToken(CLOSEBRACKET,')',1,11065)
 LexToken(TRANSPOSE,"'",1,11066)
 LexToken(CLOSESQBRACKET,']',1,11067)
-LexToken(SEMICOLON,';',1,11068)
 LexToken(EOL,'\n',1,11112)
 LexToken(END,'end',1,11117)
 LexToken(EOL,'\n',1,11120)
diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js
index 30174d65..605294d8 100644
--- a/js/Sources/TKSCALE.js
+++ b/js/Sources/TKSCALE.js
@@ -178,7 +178,6 @@ LexToken(EOL,'\n',1,1569)
 LexToken(VAR,'f',1,1579)
 LexToken(ASSIGNMENT,'=',1,1580)
 LexToken(NUMBER,'1',1,1581)
-LexToken(SEMICOLON,';',1,1582)
 LexToken(EOL,'\n',1,1610)
 LexToken(VAR,'model',1,1619)
 LexToken(ASSIGNMENT,'=',1,1624)
diff --git a/sci2jslex.py b/sci2jslex.py
index abf513e4..a3d973c7 100755
--- a/sci2jslex.py
+++ b/sci2jslex.py
@@ -82,6 +82,22 @@ t_ignore = ' \t'
 t_qstring_ignore = ''
 t_dqstring_ignore = ''
 
+def t_COMMA_COMMENT(t):
+    r',[ \t]*//.*'
+    global afterarray, brackets
+    if brackets != 0:
+        afterarray = False
+        t.type = 'COMMA'
+        return t
+
+def t_SEMICOLON_COMMENT(t):
+    r';[ \t]*//.*'
+    global afterarray, brackets
+    if brackets != 0:
+        afterarray = False
+        t.type = 'SEMICOLON'
+        return t
+
 def t_COMMENT(t):
     r'\.\.+[ \t]*(//.*)?(\n|$)|//.*'
     pass