GCC errors

dsyme · KevinRansom · commit 4c802f174ac3 · 2015-09-29T15:57:59.000-07:00
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
@@ -1345,6 +1345,7 @@ type ErrorStyle =
     | EmacsErrors 
     | TestErrors 
     | VSErrors
+    | GccErrors
 
 let SanitizeFileName fileName implicitIncludeDir =
     // The assert below is almost ok, but it fires in two cases:
@@ -1419,6 +1420,11 @@ let CollectErrorOrWarning (implicitIncludeDir,showFullPaths,flattenErrors,errorS
                     let m = mkRange m.FileName (mkPos m.StartLine (m.StartColumn + 1)) (mkPos m.EndLine (m.EndColumn + 1) )
                     sprintf "%s(%d,%d-%d,%d): " file m.StartLine m.StartColumn m.EndLine m.EndColumn, m, file
 
+                  | ErrorStyle.GccErrors     -> 
+                    let file = file.Replace('/',System.IO.Path.DirectorySeparatorChar)
+                    let m = mkRange m.FileName (mkPos m.StartLine (m.StartColumn + 1)) (mkPos m.EndLine (m.EndColumn + 1) )
+                    sprintf "%s:%d:%d: " file m.StartLine m.StartColumn, m, file
+
                   // Here, we want the complete range information so Project Systems can generate proper squiggles
                   | ErrorStyle.VSErrors      -> 
                         // Show prefix only for real files. Otherise, we just want a truncated error like:
@@ -1990,6 +1996,7 @@ type TcConfigBuilder =
       /// if true - every expression in quotations will be augmented with full debug info (filename, location in file)
       mutable emitDebugInfoInQuotations : bool
 
+      mutable exename : string option
       /// When false FSI will lock referenced assemblies requiring process restart, false = disable Shadow Copy false (*default*)
       mutable shadowCopyReferences : bool
       }
@@ -2127,6 +2134,7 @@ type TcConfigBuilder =
           sqmNumOfSourceFiles = 0
           sqmSessionStartedTime = System.DateTime.Now.Ticks
           emitDebugInfoInQuotations = false
+          exename = None
           shadowCopyReferences = false
         }
 
diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi
@@ -78,7 +78,8 @@ type ErrorStyle =
     | DefaultErrors 
     | EmacsErrors 
     | TestErrors 
-    | VSErrors    
+    | VSErrors
+    | GccErrors
 
 /// Get the location associated with an error
 val GetRangeOfError : PhasedError -> range option
@@ -314,6 +315,7 @@ type TcConfigBuilder =
       mutable sqmNumOfSourceFiles : int
       sqmSessionStartedTime : int64
       mutable emitDebugInfoInQuotations : bool
+      mutable exename : string option 
       mutable shadowCopyReferences : bool }
 
 
diff --git a/src/fsharp/CompileOptions.fs b/src/fsharp/CompileOptions.fs
@@ -737,6 +737,8 @@ let vsSpecificFlags (tcConfigB: TcConfigBuilder) =
     CompilerOption("LCID", tagInt, OptionInt (fun n -> tcConfigB.lcid <- Some(n)), None, None);
     CompilerOption("flaterrors", tagNone, OptionUnit (fun () -> tcConfigB.flatErrors <- true), None, None); 
     CompilerOption("sqmsessionguid", tagNone, OptionString (fun s -> tcConfigB.sqmSessionGuid <- try System.Guid(s) |> Some  with e -> None), None, None);
+    CompilerOption("gccerrors", tagNone, OptionUnit (fun () -> tcConfigB.errorStyle <- ErrorStyle.GccErrors), None, None); 
+    CompilerOption("exename", tagNone, OptionString (fun s -> tcConfigB.exename <- Some(s)), None, None);
     CompilerOption("maxerrors", tagInt, OptionInt (fun n -> tcConfigB.maxErrors <- n), None, None); ]
 
 
diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs
@@ -427,6 +427,9 @@ type internal FsiCommandLineOptions(argv: string[], tcConfigB, fsiConsoleOutput:
 
     let executableFileName = 
         lazy 
+            match tcConfigB.exename with
+            | Some s -> s
+            | None -> 
             let currentProcess = System.Diagnostics.Process.GetCurrentProcess()
             Path.GetFileName(currentProcess.MainModule.FileName)
 
diff --git a/tests/fsharp/typecheck/sigs/build.bat b/tests/fsharp/typecheck/sigs/build.bat
@@ -23,6 +23,7 @@ call ..\..\single-neg-test.bat neg93
 call ..\..\single-neg-test.bat neg92
 @if ERRORLEVEL 1 goto Error
 
+
 call ..\..\single-neg-test.bat neg91
 @if ERRORLEVEL 1 goto Error
 
@@ -535,6 +536,8 @@ call ..\..\single-neg-test.bat neg35
 "%FSC%" %fsc_flags% -a -o:pos05.dll  pos05.fs
 @if ERRORLEVEL 1 goto Error
 
+REM --------Exit points------------------------
+
 :Ok
 echo Built fsharp %~f0 ok.
 endlocal
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fs b/tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fs
@@ -117,6 +117,8 @@
 //<Expects status="success">section='NoSection                ' ! option=no-string-interning            kind=OptionUnit</Expects>
 //<Expects status="success">section='NoSection                ' ! option=statistics                     kind=OptionUnit</Expects>
 //<Expects status="success">section='NoSection                ' ! option=generate-filter-blocks         kind=OptionUnit</Expects>
+//<Expects status="success">section='NoSection                ' ! option=gccerrors                      kind=OptionUnit</Expects>
+//<Expects status="success">section='NoSection                ' ! option=exename                        kind=OptionString</Expects>
 //<Expects status="success">section='NoSection                ' ! option=max-errors                     kind=OptionInt</Expects>
 //<Expects status="success">section='NoSection                ' ! option=debug-file                     kind=OptionString</Expects>
 //<Expects status="success">section='NoSection                ' ! option=no-debug-file                  kind=OptionUnit</Expects>
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/dumpAllCommandLineOptions/dummy.fsx
@@ -137,6 +137,8 @@
 //<Expects status="notin">section='NoSection                ' ! option=no-string-interning            kind=OptionUnit</Expects>
 //<Expects status="notin">section='NoSection                ' ! option=statistics                     kind=OptionUnit</Expects>
 //<Expects status="notin">section='NoSection                ' ! option=generate-filter-blocks         kind=OptionUnit</Expects>
+//<Expects status="notin">section='NoSection                ' ! option=gccerrors                      kind=OptionUnit</Expects>
+//<Expects status="notin">section='NoSection                ' ! option=exename                        kind=OptionString</Expects>
 //<Expects status="notin">section='NoSection                ' ! option=max-errors                     kind=OptionInt</Expects>
 //<Expects status="notin">section='NoSection                ' ! option=debug-file                     kind=OptionString</Expects>
 //<Expects status="notin">section='NoSection                ' ! option=no-debug-file                  kind=OptionUnit</Expects>
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx
@@ -0,0 +1,21 @@
+// #NoMT #CompilerOptions #RequiresENU #NETFX20Only #NETFX40Only 
+let fn1 = fsi.CommandLineArgs.[1]
+let fn2 = fsi.CommandLineArgs.[2]
+// Read file into an array
+let File2List(filename : string) = System.IO.File.ReadAllLines filename |> Array.toList
+let f1 = File2List fn1
+let f2 = File2List fn2
+let mutable i = 0
+
+let compare f1 f2 = 
+    (f1, f2) ||> List.forall2 (fun (a : string) (b : string) -> 
+                     i <- i + 1
+                     if (a = b) then true
+                     else 
+                         printfn "Files differ at line %d:" i
+                         printfn "\t>> %s" a
+                         printfn "\t<< %s" b
+                         false)
+
+exit (if (f1.Length = f2.Length && compare f1 f2) then 0
+      else 1)
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/env.lst
@@ -0,0 +1,3 @@
+ReqENU	SOURCE=gccerrors01.fs COMPILE_ONLY=1 SCFLAGS="--gccerrors --nologo gccerrors01.fs >gccerrors01.txt" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx gccerrors01.txt gccerrors01.bsl"	
+
+
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/gccerrors01.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/gccerrors01.bsl
@@ -0,0 +1,4 @@
+
+gccerrors01.fs:7:11: warning FS0025: Incomplete pattern matches on this expression. For example, the value '1' may indicate a case not covered by the pattern(s).
+
+gccerrors01.fs:8:14: warning FS0988: Main module of program is empty: nothing will happen when it is run
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/gccerrors01.fs b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/gccerrors01.fs
@@ -0,0 +1,9 @@
+// #Regression #NoMT #CompilerOptions 
+// Regression test for FSHARP1.0:6108
+
+module M
+
+let ff () =
+    match 1 with
+    | 0 -> ()
+
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx
@@ -0,0 +1,21 @@
+// #NoMT #CompilerOptions #RequiresENU #NETFX20Only #NETFX40Only 
+let fn1 = fsi.CommandLineArgs.[1]
+let fn2 = fsi.CommandLineArgs.[2]
+let File2List(filename : string) = System.IO.File.ReadAllLines filename |> Array.toList
+let f1 = File2List fn1
+let f2 = File2List fn2
+let mutable i = 0
+
+let compare f1 f2 = 
+    (f1,f2) ||> List.forall2 (fun a b -> 
+        i <- i + 1
+        if (a = b) then true
+        else 
+            printfn "Files differ at line %d:" i
+            printfn "\t>> %s" a
+            printfn "\t<< %s" b
+            false) 
+
+exit (if compare f1 f2 then 0
+      else 1)
+
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/dummy.fsx b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/dummy.fsx
@@ -0,0 +1 @@
+
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/env.lst b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/env.lst
@@ -0,0 +1,5 @@
+
+ReqENU	SOURCE=dummy.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --exename:fsharpi --help >help.txt" FSIMODE=EXEC POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx help.txt help40.437.1033.bsl"	# -?-40
+
+
+
diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl
@@ -0,0 +1,63 @@
+
+Usage: fsharpi <options> [script.fsx [<arguments>]]
+
+
+		- INPUT FILES -
+--use:<file>                   Use the given file on startup as initial input
+--load:<file>                  #load the given file on startup
+--reference:<file>             Reference an assembly (Short form: -r)
+-- ...                         Treat remaining arguments as command line
+                               arguments, accessed using fsi.CommandLineArgs
+
+
+		- CODE GENERATION -
+--debug[+|-]                   Emit debug information (Short form: -g)
+--debug:{full|pdbonly}         Specify debugging type: full, pdbonly. ('full'
+                               is the default and enables attaching a debugger
+                               to a running program).
+--optimize[+|-]                Enable optimizations (Short form: -O)
+--tailcalls[+|-]               Enable or disable tailcalls
+--crossoptimize[+|-]           Enable or disable cross-module optimizations
+
+
+		- ERRORS AND WARNINGS -
+--warnaserror[+|-]             Report all warnings as errors
+--warnaserror[+|-]:<warn;...>  Report specific warnings as errors
+--warn:<n>                     Set a warning level (0-5)
+--nowarn:<warn;...>            Disable specific warning messages
+--warnon:<warn;...>            Enable specific warnings that may be off by
+                               default
+--consolecolors[+|-]           Output warning and error messages in color
+
+
+		- LANGUAGE -
+--checked[+|-]                 Generate overflow checks
+--define:<string>              Define conditional compilation symbols (Short
+                               form: -d)
+--mlcompatibility              Ignore ML compatibility warnings
+
+
+		- MISCELLANEOUS -
+--nologo                       Suppress compiler copyright message
+--help                         Display this usage message (Short form: -?)
+
+
+		- ADVANCED -
+--codepage:<n>                 Specify the codepage used to read source files
+--utf8output                   Output messages in UTF-8 encoding
+--fullpaths                    Output messages with fully qualified paths
+--lib:<dir;...>                Specify a directory for the include path which
+                               is used to resolve source files and assemblies
+                               (Short form: -I)
+--noframework                  Do not reference the default CLI assemblies by
+                               default
+--exec                         Exit fsi after loading the files or running the
+                               .fsx script given on the command line
+--gui[+|-]                     Execute interactions on a Windows Forms event
+                               loop (on by default)
+--quiet                        Suppress fsi writing to stdout
+--readline[+|-]                Support TAB completion in console (on by
+                               default)
+--quotations-debug[+|-]        Emit debug information in quotations
+--shadowcopyreferences[+|-]    Prevents references from being locked by the F#
+                               Interactive process
diff --git a/tests/fsharpqa/Source/test.lst b/tests/fsharpqa/Source/test.lst
@@ -40,6 +40,7 @@ CompilerOptions01,NoMT				CompilerOptions\fsc\crossoptimize
 CompilerOptions01,NoMT				CompilerOptions\fsc\debug
 CompilerOptions01,NoMT				CompilerOptions\fsc\dumpAllCommandLineOptions
 CompilerOptions01,NoMT				CompilerOptions\fsc\flaterrors
+CompilerOptions02,NoMT				CompilerOptions\fsc\gccerrors
 CompilerOptions01,NoMT				CompilerOptions\fsc\help
 CompilerOptions01,NoMT				CompilerOptions\fsc\highentropyva
 CompilerOptions01,NoMT				CompilerOptions\fsc\lib
@@ -65,6 +66,7 @@ CompilerOptions01,NoMT				CompilerOptions\fsi\highentropyva
 CompilerOptions01,NoMT				CompilerOptions\fsi\nologo
 CompilerOptions01,NoMT				CompilerOptions\fsi\subsystemversion
 CompilerOptions01,NoMT				CompilerOptions\fsi\times
+CompilerOptions02,NoMT				CompilerOptions\fsi\exename
 
 
 Conformance01			Conformance\BasicGrammarElements\Constants

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ReqENU SOURCE=gccerrors01.fs COMPILE_ONLY=1 SCFLAGS="--gccerrors --nologo gccerrors01.fs >gccerrors01.txt" POSTCMD="\$FSI_PIPE --nologo --quiet --exec comparer.fsx gccerrors01.txt gccerrors01.bsl"`
	`2`	`+`
	`3`	`+`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +gccerrors01.fs:7:11: warning FS0025: Incomplete pattern matches on this expression. For example, the value '1' may indicate a case not covered by the pattern(s).
++
 +gccerrors01.fs:8:14: warning FS0988: Main module of program is empty: nothing will happen when it is run