Merge pull request #1334 from dsyme/fix-1298

Fix type declaration order when merging namespace fragments

Author: dsyme

src/fsharp/tast.fs

@@ -4712,35 +4712,34 @@ let NewClonedTycon orig =  NewModifiedTycon (fun d -> d) orig
 /// duplicate modules etc.
 let CombineCcuContentFragments m l = 
 
-    let CombineMaps f m1 m2 = 
-        Map.foldBack (fun k v acc -> Map.add k (if Map.containsKey k m2 then f [v;Map.find k m2] else f [v]) acc) m1 
-          (Map.foldBack (fun k v acc -> if Map.containsKey k m1 then acc else Map.add k (f [v]) acc) m2 Map.empty)
-
     /// Combine module types when multiple namespace fragments contribute to the
     /// same namespace, making new module specs as we go.
     let rec CombineModuleOrNamespaceTypes path m (mty1:ModuleOrNamespaceType)  (mty2:ModuleOrNamespaceType)  = 
         match mty1.ModuleOrNamespaceKind,mty2.ModuleOrNamespaceKind  with 
         | Namespace,Namespace -> 
             let kind = mty1.ModuleOrNamespaceKind
+            let tab1 = mty1.AllEntitiesByLogicalMangledName
+            let tab2 = mty2.AllEntitiesByLogicalMangledName
             let entities = 
-                (mty1.AllEntitiesByLogicalMangledName,mty2.AllEntitiesByLogicalMangledName) 
-                ||>  CombineMaps (CombineEntityList path) 
+                [ for e1 in mty1.AllEntities do 
+                      match tab2.TryFind e1.LogicalName with
+                      | Some e2 -> yield CombineEntites path e1 e2
+                      | None -> yield e1 
+                  for e2 in mty2.AllEntities do 
+                      match tab1.TryFind e2.LogicalName with
+                      | Some _ -> ()
+                      | None -> yield e2 ]
 
             let vals = QueueList.append mty1.AllValsAndMembers mty2.AllValsAndMembers
 
-            ModuleOrNamespaceType(kind, vals, QueueList.ofList (NameMap.range entities))
+            ModuleOrNamespaceType(kind, vals, QueueList.ofList entities)
 
         | Namespace, _ | _,Namespace -> 
             error(Error(FSComp.SR.tastNamespaceAndModuleWithSameNameInAssembly(textOfPath path),m))
 
         | _-> 
             error(Error(FSComp.SR.tastTwoModulesWithSameNameInAssembly(textOfPath path),m))
 
-    and CombineEntityList path l = 
-        match l with
-        | h :: t -> List.fold (CombineEntites path) h t
-        | _ -> failwith "CombineEntityList"
-
     and CombineEntites path (entity1:Entity) (entity2:Entity) = 
 
         match entity1.IsModuleOrNamespace, entity2.IsModuleOrNamespace with

tests/fsharp/core/fileorder/libfile1.fs

@@ -0,0 +1,15 @@
+
+// Repro for https://github.com/Microsoft/visualfsharp/issues/1298
+namespace Ploeh.Weird.Repro
+
+type Foo = {
+    Value : string
+    Text : string }
+
+type Bar = {
+    Value : string
+    Number : int }
+
+type Baz = {
+    Value : int
+    Text : string }

tests/fsharp/core/fileorder/libfile2.fs

@@ -0,0 +1,4 @@
+namespace Ploeh.Weird.Repro
+
+
+// deliberately empty

tests/fsharp/core/fileorder/test.fsx

@@ -0,0 +1,23 @@
+// #Conformance #Regression 
+#if Portable
+module Core_fileorder
+#endif
+
+
+open Ploeh.Weird.Repro
+
+let failures = ref false
+let report_failure s  = 
+  stderr.WriteLine ("NO: test "+s+" failed"); failures := true
+
+
+let b = {
+    Value = 42
+    Text = "Ploeh" }
+    
+let aa =
+  if !failures then (stdout.WriteLine "Test Failed"; exit 1) 
+
+do (stdout.WriteLine "Test Passed"; 
+    System.IO.File.WriteAllText("test.ok","ok"); 
+    exit 0)

tests/fsharp/core/tests_core.fs

@@ -907,6 +907,43 @@ module InternalsVisible =
         }) 
 
 
+// Repro for https://github.com/Microsoft/visualfsharp/issues/1298
+module FileOrder =
+
+    [<Test; FSharpSuiteTest("core/fileorder")>]
+    let fileorder () = check  (attempt {
+        let { Directory = dir; Config = cfg } = testContext ()
+
+        let exec p = Command.exec dir cfg.EnvironmentVariables { Output = Inherit; Input = None; } p >> checkResult
+        let fsc = Printf.ksprintf (Commands.fsc exec cfg.FSC)
+        let peverify = Commands.peverify exec cfg.PEVERIFY "/nologo"
+        let csc = Printf.ksprintf (Commands.csc exec cfg.CSC)
+        let fsc_flags = cfg.fsc_flags
+
+        log "== Compiling F# Library and Code, when empty file libfile2.fs IS NOT included"
+        do! fsc "%s -a --optimize -o:lib.dll " fsc_flags ["libfile1.fs"]
+
+        do! peverify "lib.dll"
+
+        do! fsc "%s -r:lib.dll -o:test.exe" fsc_flags ["test.fsx"]
+
+        do! peverify "test.exe"
+
+        do! exec ("."/"test.exe") ""
+
+        log "== Compiling F# Library and Code, when empty file libfile2.fs IS included"
+        do! fsc "%s -a --optimize -o:lib2.dll " fsc_flags ["libfile1.fs"; "libfile2.fs"]
+
+        do! peverify "lib2.dll"
+
+        do! fsc "%s -r:lib2.dll -o:test2.exe" fsc_flags ["test.fsx"]
+
+        do! peverify "test2.exe"
+
+        do! exec ("."/"test2.exe") ""
+        }) 
+
+
 module Interop = 
 
     let build cfg dir = attempt {