Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Compiler/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more argume
240,buildSignatureWithoutImplementation,"The signature file '%s' does not have a corresponding implementation file. If an implementation file exists then check the 'module' and 'namespace' declarations in the signature and implementation files match."
241,buildArgInvalidInt,"'%s' is not a valid integer argument"
242,buildArgInvalidFloat,"'%s' is not a valid floating point argument"
243,buildUnrecognizedOption,"Unrecognized option: '%s'"
243,buildUnrecognizedOption,"Unrecognized option: '%s'. Use '--help' to learn about recognized command line options."
244,buildInvalidModuleOrNamespaceName,"Invalid module or namespace name"
pickleErrorReadingWritingMetadata,"Error reading/writing metadata for the F# compiled DLL '%s'. Was the DLL compiled with an earlier version of the F# compiler? (error: '%s')."
245,tastTypeOrModuleNotConcrete,"The type/module '%s' is not a concrete module or type"
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.cs.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Nerozpoznaná možnost: {0}</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Nerozpoznaná možnost: {0}</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Unbekannte Option: "{0}"</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Unbekannte Option: "{0}"</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.es.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Opción no reconocida: '{0}'.</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Opción no reconocida: '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Option non reconnue : '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Option non reconnue : '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.it.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Opzione non riconosciuta: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Opzione non riconosciuta: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">認識されないオプション:'{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">認識されないオプション:'{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">인식할 수 없는 옵션: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">인식할 수 없는 옵션: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.pl.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Nierozpoznana opcja: „{0}”</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Nierozpoznana opcja: „{0}”</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Opção não reconhecida: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Opção não reconhecida: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Нераспознанный параметр: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Нераспознанный параметр: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.tr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">Tanınmayan seçenek: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">Tanınmayan seçenek: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">无法识别的选项:“{0}”</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">无法识别的选项:“{0}”</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
4 changes: 2 additions & 2 deletions src/Compiler/xlf/FSComp.txt.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1598,8 +1598,8 @@
<note />
</trans-unit>
<trans-unit id="buildUnrecognizedOption">
<source>Unrecognized option: '{0}'</source>
<target state="translated">選項無法辨認: '{0}'</target>
<source>Unrecognized option: '{0}'. Use '--help' to learn about recognized command line options.</source>
<target state="needs-review-translation">選項無法辨認: '{0}'</target>
<note />
</trans-unit>
<trans-unit id="buildInvalidModuleOrNamespaceName">
Expand Down
8 changes: 2 additions & 6 deletions src/fsi/fsimain.fs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ let internal TrySetUnhandledExceptionMode () =

#endif

/// Starts the remoting server to handle interrupt reuests from a host tool.
/// Starts the remoting server to handle interrupt requests from a host tool.
let StartServer (fsiSession: FsiEvaluationSession) (fsiServerName) =
let server =

Expand Down Expand Up @@ -344,11 +344,7 @@ let evaluateSession (argv: string[]) =
// Start the session
fsiSession.Run()
0
with
| FSharp.Compiler.DiagnosticsLogger.StopProcessingExn _ -> 1
| FSharp.Compiler.DiagnosticsLogger.ReportedError _ -> 1
| e ->
eprintf "Exception by fsi.exe:\n%+A\n" e
with e ->
1

// Mark the main thread as STAThread since it is a GUI thread
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ module Checked =
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--Checked'")
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--Checked'. Use '--help' to learn about recognized command line options.")
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
Expand All @@ -158,7 +158,7 @@ module Checked =
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--checked*'")
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--checked*'. Use '--help' to learn about recognized command line options.")
]

// SOURCE=unrecogarg.fs SCFLAGS="--checked*" # fsc--checked*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module cliversion =
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'")
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'. Use '--help' to learn about recognized command line options.")
]

//# SOURCE=E_fsi_cliversion.fs SCFLAGS="--cliversion:2.0" FSIMODE=EXEC COMPILE_ONLY=1 # fsi --cliversion:2.0
Expand All @@ -31,6 +31,6 @@ module cliversion =
|> compile
|> shouldFail
|> withDiagnostics [
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'")
(Error 243, Line 0, Col 1, Line 0, Col 1, "Unrecognized option: '--cliversion'. Use '--help' to learn about recognized command line options.")
]