Fixes require not correctly skipping already loaded modules.

moonsharp-devs · Oct 3, 2016 · 04de254 · 04de254
1 parent 2b4208b
commit 04de254
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 10 deletions.
diff --git a/src/DevTools/Playground/Playground.csproj b/src/DevTools/Playground/Playground.csproj
@@ -47,7 +47,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="samplescript.lua">
+    <None Include="test.lua">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="test2.lua">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="core.lua">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/src/DevTools/Playground/Program.cs b/src/DevTools/Playground/Program.cs
@@ -10,15 +10,20 @@ class Program
 	{
 		static void Main(string[] args)
 		{
+			((ScriptLoaderBase)Script.DefaultOptions.ScriptLoader).ModulePaths = new string[] { "./?", "./?.lua" };
+
 			try
 			{
 				Script S = new Script();
 				S.Options.ColonOperatorClrCallbackBehaviour = ColonOperatorBehaviour.TreatAsDotOnUserData;
 
-				Table my_table = S.DoString("my_table = { }; return my_table").Table;
-				my_table["Foo"] = (Action<Table, string>)((self, str) => { Console.WriteLine("!!!" + str); });
+				S.DoString(@"
+
+require 'test'
+require 'test2'
+
+");
 
-				S.DoString("my_table:Foo('Ciao');");
 
 			}
 			catch (InterpreterException ex)

diff --git a/src/DevTools/Playground/core.lua b/src/DevTools/Playground/core.lua
@@ -0,0 +1,5 @@
+
+print "in core.lua"
+
+print(os.date("*t", os.time()).hour)
+print(os.date("!*t", os.time()).hour)
diff --git a/src/DevTools/Playground/samplescript.lua b/src/DevTools/Playground/samplescript.lua
diff --git a/src/DevTools/Playground/test.lua b/src/DevTools/Playground/test.lua
@@ -0,0 +1,2 @@
+require "core"
+print("in test 1")
diff --git a/src/DevTools/Playground/test2.lua b/src/DevTools/Playground/test2.lua
@@ -0,0 +1,2 @@
+require "core"
+print("in test 2")
diff --git a/src/MoonSharp.Interpreter/CoreLib/LoadModule.cs b/src/MoonSharp.Interpreter/CoreLib/LoadModule.cs
@@ -233,6 +233,10 @@ public static DynValue __require_clr_impl(ScriptExecutionContext executionContex
 
 	local res = func(modulename);
 
+	if (res == nil) then
+		res = true;
+	end
+
 	package.loaded[modulename] = res;
 
 	return res;

diff --git a/...er/_Projects/MoonSharp.Interpreter.net40-client/MoonSharp.Interpreter.net40-client.csproj b/...er/_Projects/MoonSharp.Interpreter.net40-client/MoonSharp.Interpreter.net40-client.csproj
@@ -540,6 +540,9 @@
     <Compile Include="..\..\Loaders\InvalidScriptLoader.cs">
       <Link>InvalidScriptLoader.cs</Link>
     </Compile>
+    <Compile Include="..\..\Options\ColonOperatorBehaviour.cs">
+      <Link>ColonOperatorBehaviour.cs</Link>
+    </Compile>
     <Compile Include="..\..\REPL\ReplHistoryNavigator.cs">
       <Link>ReplHistoryNavigator.cs</Link>
     </Compile>

diff --git a/...preter/_Projects/MoonSharp.Interpreter.portable40/MoonSharp.Interpreter.portable40.csproj b/...preter/_Projects/MoonSharp.Interpreter.portable40/MoonSharp.Interpreter.portable40.csproj
@@ -537,6 +537,9 @@
     <Compile Include="..\..\Loaders\InvalidScriptLoader.cs">
       <Link>InvalidScriptLoader.cs</Link>
     </Compile>
+    <Compile Include="..\..\Options\ColonOperatorBehaviour.cs">
+      <Link>ColonOperatorBehaviour.cs</Link>
+    </Compile>
     <Compile Include="..\..\REPL\ReplHistoryNavigator.cs">
       <Link>ReplHistoryNavigator.cs</Link>
     </Compile>