diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj index 9cf94c91179..9b9513cfa34 100644 --- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj +++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj @@ -130,10 +130,10 @@ Utilities\TraceCall.fs - ErrorLogging\rational.fsi + Utilities\rational.fsi - ErrorLogging\rational.fs + Utilities\rational.fs ErrorLogging\range.fsi diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj index 47eab824504..a3fb8f2a56d 100644 --- a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj +++ b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj @@ -36,432 +36,429 @@ assemblyinfo.FSharp.Compiler.dll.fs - - --lexlib Internal.Utilities.Text.Lexing - pplex.fsl - - - Microsoft.FSharp.Compiler.PPParser - Microsoft.FSharp.Compiler - --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - pppars.fsy - - - --lexlib Internal.Utilities.Text.Lexing - lex.fsl - - - --lexlib Internal.Utilities.Text.Lexing - illex.fsl - - - Microsoft.FSharp.Compiler.Parser - Microsoft.FSharp.Compiler - --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - pars.fsy - - - Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser - Microsoft.FSharp.Compiler.AbstractIL - --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing - ilpars.fsy - - - ExtensibleDumper.fsi - - - ExtensibleDumper.fs - - sformat.fsi + ErrorText\sformat.fsi - sformat.fs + ErrorText\sformat.fs - sr.fsi + ErrorText\sr.fsi - sr.fs + ErrorText\sr.fs - prim-lexing.fsi + LexYaccRuntime\prim-lexing.fsi - prim-lexing.fs + LexYaccRuntime\prim-lexing.fs - prim-parsing.fsi + LexYaccRuntime\prim-parsing.fsi - prim-parsing.fs + LexYaccRuntime\prim-parsing.fs - resizearray.fsi + Utilities\resizearray.fsi - resizearray.fs + Utilities\resizearray.fs - HashMultiMap.fsi + Utilities\HashMultiMap.fsi - HashMultiMap.fs + Utilities\HashMultiMap.fs - TaggedCollections.fsi + Utilities\TaggedCollections.fsi - TaggedCollections.fs + Utilities\TaggedCollections.fs - FlatList.fs + Utilities\FlatList.fs + + + Utilities\QueueList.fs - illib.fs + Utilities\illib.fs - filename.fsi + Utilities\filename.fsi - filename.fs + Utilities\filename.fs - zmap.fsi + Utilities\zmap.fsi - zmap.fs + Utilities\zmap.fs - zset.fsi + Utilities\zset.fsi - zset.fs + Utilities\zset.fs - bytes.fsi + Utilities\bytes.fsi - bytes.fs + Utilities\bytes.fs - ildiag.fsi + Utilities\ildiag.fsi - ildiag.fs + Utilities\ildiag.fs + + + Utilities\lib.fs + + + Utilities\InternalCollections.fsi + + + Utilities\InternalCollections.fs + + + Utilities\InternalFileSystemUtils.fsi + + + Utilities\InternalFileSystemUtils.fs + + + Utilities\rational.fsi + + + Utilities\rational.fs + + + Utilities\TraceCall.fs + + + ErrorLogging\range.fsi + + + ErrorLogging\range.fs + + + ErrorLogging\ErrorLogger.fs - ReferenceResolution.fs + ReferenceResolution\ReferenceResolution.fs + + --lexlib Internal.Utilities.Text.Lexing + AbsIL\illex.fsl + + + Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser + Microsoft.FSharp.Compiler.AbstractIL + --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + AbsIL\ilpars.fsy + - il.fsi + AbsIL\il.fsi - il.fs + AbsIL\il.fs - ilx.fsi + AbsIL\ilx.fsi - ilx.fs + AbsIL\ilx.fs - ilascii.fsi + AbsIL\ilascii.fsi - ilascii.fs + AbsIL\ilascii.fs - ilprint.fsi + AbsIL\ilprint.fsi - ilprint.fs + AbsIL\ilprint.fs - ilmorph.fsi + AbsIL\ilmorph.fsi - ilmorph.fs + AbsIL\ilmorph.fs - ilsupp.fsi + AbsIL\ilsupp.fsi - ilsupp.fs + AbsIL\ilsupp.fs - - - - ilbinary.fsi - - - ilbinary.fs - - - lib.fs - - - range.fsi + + AbsIL\ilpars.fs - - range.fs + + AbsIL\illex.fs - - rational.fsi - - - rational.fs - - - ErrorLogger.fs - - - tainted.fsi - - - tainted.fs - - - InternalCollections.fsi + + AbsIL\ilbinary.fsi - - InternalCollections.fs + + AbsIL\ilbinary.fs - ilread.fsi + AbsIL\ilread.fsi - ilread.fs + AbsIL\ilread.fs - CompilerLocationUtils.fs + CompilerLocation\CompilerLocationUtils.fs - PrettyNaming.fs + PrettyNaming\PrettyNaming.fs - ilxsettings.fs + ILXErase\ilxsettings.fs - - InternalFileSystemUtils.fsi - - - InternalFileSystemUtils.fs - - - unilex.fsi + + --lexlib Internal.Utilities.Text.Lexing + ParserAndUntypedAST\pplex.fsl + + + Microsoft.FSharp.Compiler.PPParser + Microsoft.FSharp.Compiler + --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + ParserAndUntypedAST\pppars.fsy + + + --lexlib Internal.Utilities.Text.Lexing + ParserAndUntypedAST\lex.fsl + + + Microsoft.FSharp.Compiler.Parser + Microsoft.FSharp.Compiler + --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing + ParserAndUntypedAST\pars.fsy + + + ParserAndUntypedAST\UnicodeLexing.fsi - - unilex.fs + + ParserAndUntypedAST\UnicodeLexing.fs - layout.fsi + ParserAndUntypedAST\layout.fsi - layout.fs + ParserAndUntypedAST\layout.fs - ast.fs + ParserAndUntypedAST\ast.fs - - est.fsi + + ParserAndUntypedAST\pppars.fs - - est.fs + + ParserAndUntypedAST\pars.fs - - lexhelp.fsi + ParserAndUntypedAST\lexhelp.fsi - lexhelp.fs + ParserAndUntypedAST\lexhelp.fs - - - - - sreflect.fsi + + ParserAndUntypedAST\pplex.fs - - sreflect.fs + + ParserAndUntypedAST\lex.fs - - QueueList.fs + + ParserAndUntypedAST\lexfilter.fs - - tast.fs + + TypedAST\tainted.fsi - - env.fs + + TypedAST\tainted.fs - - tastops.fsi + + TypedAST\ExtensionTyping.fsi - - tastops.fs + + TypedAST\ExtensionTyping.fs - - pickle.fsi + + TypedAST\QuotationPickler.fsi - - pickle.fs + + TypedAST\QuotationPickler.fs - - lexfilter.fs + + TypedAST\tast.fs - - import.fsi + + TypedAST\TcGlobals.fs - - import.fs + + TypedAST\TastOps.fsi - - infos.fs + + TypedAST\TastOps.fs - - NicePrint.fs + + TypedAST\TastPickle.fsi - - augment.fsi + + TypedAST\TastPickle.fs - - augment.fs + + Logic\import.fsi - - outcome.fsi + + Logic\import.fs - - outcome.fs + + Logic\infos.fs - - nameres.fsi + + Logic\NicePrint.fs - - nameres.fs + + Logic\AugmentWithHashCompare.fsi - - typrelns.fs + + Logic\AugmentWithHashCompare.fs - - patcompile.fsi + + Logic\NameResolution.fsi - - patcompile.fs + + Logic\NameResolution.fs - - csolve.fsi + + Logic\TypeRelations.fs - - csolve.fs + + Logic\PatternMatchCompilation.fsi - - formats.fsi + + Logic\PatternMatchCompilation.fs - - formats.fs + + Logic\ConstraintSolver.fsi - - unsolved.fs + + Logic\ConstraintSolver.fs - - creflect.fsi + + Logic\CheckFormatStrings.fsi - - creflect.fs + + Logic\CheckFormatStrings.fs - - check.fsi + + Logic\FindUnsolved.fs - - check.fs + + Logic\QuotationTranslator.fsi - - tc.fsi + + Logic\QuotationTranslator.fs - - tc.fs + + Logic\PostInferenceChecks.fsi - - opt.fsi + + Logic\PostInferenceChecks.fs - - opt.fs + + Logic\TypeChecker.fsi - - TraceCall.fsi + + Logic\TypeChecker.fs - - TraceCall.fs + + Optimize\Optimizer.fsi + + + Optimize\Optimizer.fs - CompileOps.fsi + Driver\CompileOps.fsi - CompileOps.fs + Driver\CompileOps.fs - - fscopts.fsi + + Driver\CompileOptions.fsi - - fscopts.fs + + Driver\CompileOptions.fs - IncrementalBuild.fsi + Driver\IncrementalBuild.fsi - IncrementalBuild.fs + Driver\IncrementalBuild.fs - fsc.fs + Driver\fsc.fs - Reactor.fsi + Service\Reactor.fsi - Reactor.fs + Service\Reactor.fs - ServiceLexing.fsi + Service\ServiceLexing.fsi - ServiceLexing.fs + Service\ServiceLexing.fs - ServiceConstants.fs + Service\ServiceConstants.fs - ServiceParseTreeWalk.fs + Service\ServiceParseTreeWalk.fs - ServiceNavigation.fsi + Service\ServiceNavigation.fsi - ServiceNavigation.fs + Service\ServiceNavigation.fs - ServiceParamInfoLocations.fsi + Service\ServiceParamInfoLocations.fsi - ServiceParamInfoLocations.fs + Service\ServiceParamInfoLocations.fs - ServiceUntypedParse.fsi + Service\ServiceUntypedParse.fsi - ServiceUntypedParse.fs + Service\ServiceUntypedParse.fs - ServiceDeclarations.fsi + Service\ServiceDeclarations.fsi - ServiceDeclarations.fs + Service\ServiceDeclarations.fs - service.fsi + Service\service.fsi - service.fs + Service\service.fs diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index 4b5d4b3363c..efe0e8fae9f 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -3261,6 +3261,7 @@ and p_ModuleInfo x st = and p_LazyModuleInfo x st = p_lazy p_ModuleInfo x st +let p_CcuOptimizationInfo x st = p_LazyModuleInfo x st #endif // !NO_COMPILER_BACKEND @@ -3289,5 +3290,4 @@ and u_ModuleInfo st = and u_LazyModuleInfo st = u_lazy u_ModuleInfo st -let p_CcuOptimizationInfo x st = p_LazyModuleInfo x st let u_CcuOptimizationInfo st = u_LazyModuleInfo st