Merge branch 'master' of gitlab.com:gambas/gambas

app/src/gbs3/.project

@@ -2,13 +2,13 @@
 Title=gbs3
 Startup=MMain
 Icon=icon.png
-Version=3.11.90
+Version=3.12.0
 VersionFile=1
 Component=gb.eval
 Description="Gambas Script"
 Authors="Fabien Bodard, Benoit Minisini"
-Arguments=[["-e","-p","for each {s}s in dir(\"/\"):print s:next"]]
-CurrentArgument=0
+Arguments=[["--help"],["-e","For i as Integer To 10:Print \"Hello World\":Next"]]
+CurrentArgument=2
 TabSize=2
 Language=fr
 Maintainer=benoit

app/src/gbs3/.src/MMain.module

@@ -502,7 +502,9 @@ Private Sub GenerateFilesFromArgs(sLine As String)
     sCode &= s
 
   Next
+  
   $aVarsDecl.Clear
+  
   If $bPrecompiler Then
     For Each s In Split(sCode, "\n")
       sNew &= PrecompileLine(s) & "\n"
@@ -511,9 +513,10 @@ Private Sub GenerateFilesFromArgs(sLine As String)
     For i = 0 To $aVarsDecl.Max
       If InStr(sNew, $aVarsDecl[i], 0, gb.IgnoreCase) Then $aVarsDecl[i] = ""
     Next
+    sCode = sNew
   Endif
 
-  scode = "Public Sub Main()\n" & $aVarsDecl.Join("\n") & "\n" & sNew
+  scode = "Public Sub Main()\n" & $aVarsDecl.Join("\n") & "\n" & sCode
   sCode &= "\nEnd\n"
 
   Print #$hOutFile, sCode