Merge pull request #22 from Pika-Software/dev

Version 2.1.7

Author: dankmolot

README.md

@@ -16,16 +16,15 @@ Just add `require "moonloader"` line into your autorun!
 ```lua
 require "moonloader"
 ```
-2. Include your `.moon` file with `include`
+2. Include your `.moon`/`.yue` file with `include`
 ```lua
--- you can use example/init.moon, but for the sake of compability
--- I suggest to use .lua instead of .moon
-include "example/init.lua" -- Will automatically generate .lua from .moon in garrysmod/cache/moonloader/lua
+-- you need to pass `.lua` to include since Garry's Mod wont accept anything else
+-- but gm_moonloader will find a .moon file and load it
+include "example/init.lua" -- Will automatically generate .lua from .moon/.yue in garrysmod/cache/moonloader/lua
 ```
-3. (optional) before using finding lua files with `file.Find` or reading them I suggest to use `moonloader.PreCacheDir("yourdirectory")` to compile .lua files from all .moon files
 
 ## Notes
-* Compiled `.moon` files are stored in `garrysmod/cache/moonloader/lua` folder. This folder is cleaned up after each startup.
+* Compiled `.moon`/`.yue` files are stored in `garrysmod/cache/moonloader/lua` folder. This folder is cleaned up after each startup.
 
 ## Example
 ```lua

VERSION

@@ -1 +1 @@
-2.1.6
+2.1.7

source/lua_api.cpp

@@ -325,7 +325,14 @@ int LuaAPI::DebugGetInfo(GarrysMod::Lua::ILuaInterface* LUA) {
     GetInfo_ref.Push();
     int iArgs = LUA->Top() - 1;
     for (int i = 1; i <= iArgs; i++) {
-        LUA->Push(i);
+        if (i == 1 && LUA->IsType(i, GarrysMod::Lua::Type::Number)) {
+            double stackPos = LUA->GetNumber(i);
+            // Hide original debug.getinfo builtin function from the stack
+            stackPos += 1;
+            LUA->PushNumber(stackPos);
+        } else {
+            LUA->Push(i);
+        }
     }
     LUA->Call(iArgs, 1);
 

source/watchdog.cpp

@@ -30,17 +30,17 @@ namespace Symbols {
     std::vector<Symbol> HandleFileChange = {
 #if ARCHITECTURE_IS_X86
     #if SYSTEM_IS_WINDOWS
-        Symbol::FromSignature("\x55\x8b\xec\x83\xec\x60\x56\x8b\x75\x08\x8d\x45\xd0\x57\x56\x50\xe8\x2a\x2a\x2a\x00\x83\xc4\x08\x83\x7d\xe0\x00\x0f\x84\x60\x02"),
+        Symbol::FromSignature("\x55\x8b\xec\x83\xec\x60\x56\x8b\x75\x08\x8d\x45\xd0\x57\x56\x50\xe8\x2A\x2A\x2A\x00\x83\xc4\x08\x83\x7d\xe0\x00\x0f\x84\x60\x02"),
     #elif SYSTEM_IS_LINUX
-        Symbol::FromSignature("\x55\x89\xe5\x57\x56\x53\x8d\x5d\x98\x83\xec\x7c\x8b\x75\x08\x89\x1c\x24\x89\x74\x24\x04\xe8\x44\x4d\x94\x00\x8b\x45\x98\x83\xec\x04\x8b\x50\xf4\x85\xd2\x0f\x84\x86\x00\x00\x00\x8d\x45\xb8\x89"),
+        Symbol::FromSignature("\x55\x89\xe5\x57\x56\x53\x8d\x5d\x98\x83\xec\x7c\x8b\x75\x08\x89\x1c\x24\x89\x74\x24\x04\xe8\x2A\x2A\x2A\x00\x8b\x45\x98\x83\xec"),
     #endif
 #elif ARCHITECTURE_IS_X86_64
     #if SYSTEM_IS_WINDOWS
         Symbol::FromSignature("\x48\x89\x5c\x24\x10\x48\x89\x74\x24\x18\x48\x89\x7c\x24\x20\x55\x48\x8d\x6c\x24\xa9\x48\x81\xec\xb0\x00\x00\x00\x48\x8b\x05\x2A"),
     #elif SYSTEM_IS_LINUX
-        Symbol::FromSignature("\x55\x48\x89\xfe\x48\x89\xe5\x41\x57\x41\x56\x41\x55\x41\x54\x4c\x8d\x65\x80\x53\x48\x89\xfb\x4c\x89\xe7\x48\x83\xec\x68\xe8\x2d\x23\x1c\x00\x48\x8b\x45\x80\x48\x83\x78\xe8\x00\x75\x2a\x48\x8b"),
+        Symbol::FromSignature("\x55\x48\x89\xfe\x48\x89\xe5\x41\x57\x41\x56\x41\x55\x41\x54\x4c\x8d\x65\x80\x53\x48\x89\xfb\x4c\x89\xe7\x48\x83\xec\x68\xe8\x2A")
     #elif SYSTEM_IS_MACOSX
-        Symbol::FromSignature("\x55\x48\x89\xe5\x53\x48\x81\xec\x88\x00\x00\x00\x48\x89\xfb\x48\x8d\x7d\xc8\x48\x89\xde\xe8\x2A\x21\x11\x00\x8a\x4d\xc8\x89\xc8"),
+        Symbol::FromSignature("\x55\x48\x89\xe5\x53\x48\x81\xec\x88\x00\x00\x00\x48\x89\xfb\x48\x8d\x7d\xc8\x48\x89\xde\xe8\x2A\x2A\x2A\x00\x8a\x4d\xc8\x89\xc8"),
     #endif
 #endif
     };