Minor cleanup and alignment with internal build projects

dotnet · Aug 12, 2015 · cfae0cf · cfae0cf
1 parent d99ceb1
commit cfae0cf
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 45 deletions.
diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt
@@ -928,9 +928,9 @@ optsEmitDebugInfoInQuotations,"Emit debug information in quotations"
 # service.fs strings
 # -----------------------------------------------------------------------------
 typeInfoFullName,"Full name"
-typeInfoType,"type"
-typeInfoInherits,"inherits"
-typeInfoImplements,"implements"
+# typeInfoType,"type"
+# typeInfoInherits,"inherits"
+# typeInfoImplements,"implements"
 typeInfoOtherOverloads,"and %d other overloads"
 typeInfoUnionCase,"union case"
 typeInfoActivePatternResult,"active pattern result"
@@ -1089,8 +1089,8 @@ lexHashBangMustBeFirstInFile,"#! may only appear as the first line at the start
 1189,parsNonAdjacentTypars,"Type parameters must be placed directly adjacent to the type name, e.g. \"type C<'T>\", not     type \"C   <'T>\""
 1190,parsNonAdjacentTyargs,"Type arguments must be placed directly adjacent to the type name, e.g. \"C<'T>\", not \"C  <'T>\""
 parsNonAtomicType,"The use of the type syntax 'int C' and 'C  <int>' is not permitted here. Consider adjusting this type to be written in the form 'C<int>'"
-1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
-1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
+# 1191,tastUndefinedTyconItemField,"The type %s did not contain the field '%s'"
+# 1192,tastUndefinedTyconItemUnionCase,"The type %s did not contain the union case '%s'"
 1193,tastUndefinedItemRefModuleNamespace,"The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s'"
 1194,tastUndefinedItemRefVal,"The module/namespace '%s' from compilation unit '%s' did not contain the val '%s'"
 1195,tastUndefinedItemRefModuleNamespaceType,"The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s'"

diff --git a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
@@ -133,6 +133,9 @@
     <Compile Include="..\..\absil\ildiag.fs">
       <Link>ildiag.fs</Link>
     </Compile>
+    <Compile Include="..\ReferenceResolution.fsi">
+      <Link>ReferenceResolution.fsi</Link>
+    </Compile>
     <Compile Include="..\ReferenceResolution.fs">
       <Link>ReferenceResolution.fs</Link>
     </Compile>
@@ -228,12 +231,15 @@
     <Compile Include="..\..\ilx\ilxsettings.fs">
       <Link>ilxsettings.fs</Link>
     </Compile>
-	  <Compile Include="..\..\ilx\EraseClosures.fsi">
-		  <Link>EraseClosures.fsi</Link>
-	  </Compile>
-	  <Compile Include="..\..\ilx\EraseClosures.fs">
+    <Compile Include="..\..\ilx\EraseClosures.fsi">
+        <Link>EraseClosures.fsi</Link>
+    </Compile>
+    <Compile Include="..\..\ilx\EraseClosures.fs">
       <Link>EraseClosures.fs</Link>
     </Compile>
+    <Compile Include="..\..\ilx\EraseUnions.fsi">
+      <Link>EraseUnions.fsi</Link>
+    </Compile>
     <Compile Include="..\..\ilx\EraseUnions.fs">
       <Link>EraseUnions.fs</Link>
     </Compile>
@@ -268,14 +274,11 @@
     </Compile>
     <Compile Include="pplex.fs" />
     <Compile Include="lex.fs" />
-    <Compile Include="..\ast.fs">
-	  <Link>ast.fs</Link>
-    </Compile>
     <Compile Include="..\QuotationPickler.fsi">
          <Link>QuotationPickler.fsi</Link>
     </Compile>
     <Compile Include="..\QuotationPickler.fs">
-	  <Link>QuotationPickler.fs</Link>
+        <Link>QuotationPickler.fs</Link>
     </Compile>
     <Compile Include="..\QueueList.fs">
       <Link>QueueList.fs</Link>
@@ -284,14 +287,14 @@
       <Link>tast.fs</Link>
     </Compile>
     <Compile Include="..\TcGlobals.fs">
-		  <Link>TcGlobals.fs</Link>
-	  </Compile>
-	  <Compile Include="..\TastOps.fsi">
-		  <Link>TastOps.fsi</Link>
-	  </Compile>
-	  <Compile Include="..\TastOps.fs">
-		  <Link>TastOps.fs</Link>
-	  </Compile>
+        <Link>TcGlobals.fs</Link>
+    </Compile>
+    <Compile Include="..\TastOps.fsi">
+        <Link>TastOps.fsi</Link>
+    </Compile>
+    <Compile Include="..\TastOps.fs">
+        <Link>TastOps.fs</Link>
+    </Compile>
     <Compile Include="..\TastPickle.fsi">
       <Link>TastPickle.fsi</Link>
     </Compile>
@@ -334,10 +337,10 @@
     <Compile Include="..\PatternMatchCompilation.fs">
       <Link>PatternMatchCompilation.fs</Link>
     </Compile>
-	  <Compile Include="..\ConstraintSolver.fsi">
-		  <Link>ConstraintSolver.fsi</Link>
-	  </Compile>
-	  <Compile Include="..\ConstraintSolver.fs">
+    <Compile Include="..\ConstraintSolver.fsi">
+        <Link>ConstraintSolver.fsi</Link>
+    </Compile>
+    <Compile Include="..\ConstraintSolver.fs">
       <Link>ConstraintSolver.fs</Link>
     </Compile>
     <Compile Include="..\CheckFormatStrings.fsi">
@@ -370,16 +373,16 @@
     <Compile Include="..\Optimizer.fsi">
       <Link>Optimizer.fsi</Link>
     </Compile>
+    <Compile Include="..\Optimizer.fs">
+      <Link>Optimizer.fs</Link>
+    </Compile>
     <Compile Include="..\autobox.fs">
       <Link>autobox.fs</Link>
     </Compile>
-    <Compile Include="..\Optimizer.fs">
-      <Link>Optimizer.fs</Link>
+    <Compile Include="..\DetupleArgs.fsi">
+        <Link>DetupleArgs.fsi</Link>
     </Compile>
-	  <Compile Include="..\DetupleArgs.fsi">
-		  <Link>DetupleArgs.fsi</Link>
-	  </Compile>
-	  <Compile Include="..\DetupleArgs.fs">
+    <Compile Include="..\DetupleArgs.fs">
       <Link>DetupleArgs.fs</Link>
     </Compile>
     <Compile Include="..\InnerLambdasToTopLevelFuncs.fsi">
@@ -421,6 +424,9 @@
     <Compile Include="..\vs\IncrementalBuild.fs">
       <Link>IncrementalBuild.fs</Link>
     </Compile>
+    <Compile Include="..\fsc.fsi">
+      <Link>fsc.fsi</Link>
+    </Compile>
     <Compile Include="..\fsc.fs">
       <Link>fsc.fs</Link>
     </Compile>

diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
@@ -144,6 +144,9 @@
     <Compile Include="..\ErrorLogger.fs">
       <Link>ErrorLogging\ErrorLogger.fs</Link>
     </Compile>
+    <Compile Include="..\ReferenceResolution.fsi">
+      <Link>ReferenceResolution\ReferenceResolution.fsi</Link>
+    </Compile>
     <Compile Include="..\ReferenceResolution.fs">
       <Link>ReferenceResolution\ReferenceResolution.fs</Link>
     </Compile>
@@ -447,6 +450,9 @@
     <Compile Include="..\vs\IncrementalBuild.fs">
       <Link>Driver\IncrementalBuild.fs</Link>
     </Compile>
+    <Compile Include="..\fsc.fsi">
+      <Link>Driver\fsc.fsi</Link>
+    </Compile>
     <Compile Include="..\fsc.fs">
       <Link>Driver\fsc.fs</Link>
     </Compile>

diff --git a/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj b/src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
@@ -151,6 +151,9 @@
     <Compile Include="..\ErrorLogger.fs">
       <Link>ErrorLogging\ErrorLogger.fs</Link>
     </Compile>
+    <Compile Include="..\ReferenceResolution.fsi">
+      <Link>ReferenceResolution\ReferenceResolution.fsi</Link>
+    </Compile>
     <Compile Include="..\ReferenceResolution.fs">
       <Link>ReferenceResolution\ReferenceResolution.fs</Link>
     </Compile>
@@ -188,18 +191,6 @@
     <Compile Include="..\..\absil\ilprint.fs">
       <Link>AbsIL\ilprint.fs</Link>
     </Compile>
-    <Compile Include="..\..\absil\ilmorph.fsi">
-      <Link>AbsIL\ilmorph.fsi</Link>
-    </Compile>
-    <Compile Include="..\..\absil\ilmorph.fs">
-      <Link>AbsIL\ilmorph.fs</Link>
-    </Compile>
-    <Compile Include="..\..\absil\ilsupp.fsi">
-      <Link>AbsIL\ilsupp.fsi</Link>
-    </Compile>
-    <Compile Include="..\..\absil\ilsupp.fs">
-      <Link>AbsIL\ilsupp.fs</Link>
-    </Compile>
     <Compile Include="ilpars.fs">
       <Link>AbsIL\ilpars.fs</Link>
     </Compile>
@@ -409,6 +400,9 @@
     <Compile Include="..\vs\IncrementalBuild.fs">
       <Link>Driver\IncrementalBuild.fs</Link>
     </Compile>
+    <Compile Include="..\fsc.fsi">
+      <Link>Driver\fsc.fsi</Link>
+    </Compile>
     <Compile Include="..\fsc.fs">
       <Link>Driver\fsc.fs</Link>
     </Compile>

diff --git a/src/fsharp/ReferenceResolution.fsi b/src/fsharp/ReferenceResolution.fsi
@@ -70,7 +70,7 @@ module internal MSBuildResolver =
     /// Perform assembly resolution on the given references
     val Resolve:
                 resolutionEnvironment: ResolutionEnvironment *
-                references:(string*(*baggage*)string)[] * 
+                references:seq<string (* baggage *) * string> * 
                 targetFrameworkVersion:string *
                 targetFrameworkDirectories:string list *
                 targetProcessorArchitecture:string *

diff --git a/src/fsharp/fsc.fsi b/src/fsharp/fsc.fsi
@@ -4,7 +4,7 @@ module internal Microsoft.FSharp.Compiler.Driver
 
 open Microsoft.FSharp.Compiler.ErrorLogger
 open Microsoft.FSharp.Compiler.CompileOps
-open Microsoft.FSharp.Compiler.Env
+open Microsoft.FSharp.Compiler.TcGlobals
 open Microsoft.FSharp.Compiler.Tast
 open Microsoft.FSharp.Compiler.TypeChecker