Some re-org of Prime.

Some bits of code clean-up. Former-commit-id: 217f4e4
bryanedds · Apr 4, 2015 · 82676e4 · 82676e4
1 parent 22168a5
commit 82676e4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/Nu/Nu/Nu/Simulation.fs b/Nu/Nu/Nu/Simulation.fs
@@ -87,7 +87,7 @@ module SimulationModule =
     /// Represents an untyped message to a subsystem.
     type SubsystemMessage = obj
 
-    /// Represents an untype result of a subsystem.
+    /// Represents an untyped result of a subsystem.
     type SubsystemResult = obj
 
     /// The type of subsystem. Dictates where subsystem's processing happens in the game loop.
@@ -453,7 +453,7 @@ module SimulationModule =
         interface SimulantState
 
     /// A marker interface for the simulation types (Game, Screen, Group, and Entity).
-    /// The only methods that have a place in here are those used internally by Nu's event system.
+    /// The only methods that belong here are those used internally by Nu's event system.
     and Simulant =
         interface
             /// Get the entity's publishing priority.

diff --git a/Nu/Nu/Nu/World.fs b/Nu/Nu/Nu/World.fs
@@ -309,9 +309,9 @@ module WorldModule =
         static member tryReloadAssets inputDirectory outputDirectory refinementDirectory world =
 
             // try to reload asset graph file
-            try File.Copy (
-                    Path.Combine (inputDirectory, world.State.AssetGraphFilePath),
-                    Path.Combine (outputDirectory, world.State.AssetGraphFilePath), true)
+            try File.Copy
+                    (Path.Combine (inputDirectory, world.State.AssetGraphFilePath),
+                     Path.Combine (outputDirectory, world.State.AssetGraphFilePath), true)
 
                 // reload asset graph
                 match Assets.tryBuildAssetGraph inputDirectory outputDirectory refinementDirectory false world.State.AssetGraphFilePath with

diff --git a/Nu/Nu/NuPipe/Program.fs b/Nu/Nu/NuPipe/Program.fs
@@ -14,4 +14,4 @@ module Program =
             match Assets.tryBuildAssetGraph inputDirectory outputDirectory refinementDirectory fullBuild AssetGraphFilePath with
             | Right () -> SuccessExitCode
             | Left error -> Console.WriteLine error; FailureExitCode
-        | _ -> Console.WriteLine "NuPipe.exe requires four parameters: inputDirectory, outputDirectory, refinementDirectory, and fullBuild."; FailureExitCode
+        | _ -> Console.WriteLine "NuPipe.exe requires four parameters: inputDirectory, outputDirectory, refinementDirectory, and a fullBuild flag."; FailureExitCode
diff --git a/Prime/Prime/Prime/Interactive.fsx b/Prime/Prime/Prime/Interactive.fsx
@@ -15,23 +15,26 @@
 #load "Option.fs"
 #load "Pair.fs"
 #load "Triple.fs"
+#load "Either.fs"
 #load "Seq.fs"
 #load "Array.fs"
 #load "String.fs"
 #load "List.fs"
 #load "Set.fs"
 #load "Map.fs"
+#load "MapPlus.fs"
 #load "PersistentHashMap.fs"
+#load "RduTree.fs"
 #load "HashSet.fs"
 #load "Dictionary.fs"
 #load "Lens.fs"
+#load "Rand.fs"
+#load "KeyedCache.fs"
+#load "MutantCache.fs"
 #load "AlgebraicReader.fs"
 #load "AlgebraicConverter.fs"
+#load "AlgebraicDescriptor.fs"
 #load "AlgebraicString.fs"
-#load "Either.fs"
-#load "MapPlus.fs"
-#load "RduTree.fs"
-#load "Rand.fs"
 
 open System
 open FSharpx

diff --git a/Prime/Prime/Prime/Prime.fsproj b/Prime/Prime/Prime/Prime.fsproj
@@ -66,32 +66,32 @@
     <Compile Include="Option.fs" />
     <Compile Include="Pair.fs" />
     <Compile Include="Triple.fs" />
+    <Compile Include="Either.fs" />
     <Compile Include="Seq.fs" />
     <Compile Include="Array.fs" />
     <Compile Include="String.fs" />
     <Compile Include="List.fs" />
     <Compile Include="Set.fs" />
     <Compile Include="Map.fs" />
+    <Compile Include="MapPlus.fs" />
     <Compile Include="PersistentHashMap.fs" />
-    <Compile Include="Lens.fs" />
+    <Compile Include="RduTree.fs" />
     <Compile Include="HashSet.fs" />
     <Compile Include="Dictionary.fs" />
+    <Compile Include="Lens.fs" />
+    <Compile Include="Rand.fs" />
     <Compile Include="KeyedCache.fs" />
     <Compile Include="MutantCache.fs" />
     <Compile Include="AlgebraicReader.fs" />
     <Compile Include="AlgebraicConverter.fs" />
     <Compile Include="AlgebraicDescriptor.fs" />
     <Compile Include="AlgebraicString.fs" />
-    <Compile Include="Either.fs" />
-    <Compile Include="MapPlus.fs" />
-    <Compile Include="RduTree.fs" />
-    <Compile Include="Rand.fs" />
     <Compile Include="Implicit.fs" />
     <Compile Include="DuckTyping.fs" />
     <Compile Include="ImmutableSubclass.fs" />
+    <Compile Include="RandTests.fs" />
     <Compile Include="AlgebraicReaderTests.fs" />
     <Compile Include="AlgebraicConverterTests.fs" />
-    <Compile Include="RandTests.fs" />
     <Compile Include="Program.fs" />
     <None Include="Interactive.fsx" />
     <None Include="App.config" />