Merge pull request #339 from MCJack123/lua-5.2

v2.8: CC:T 1.109.2, Lua 5.2

.github/workflows/main.yml

@@ -9,6 +9,7 @@ on:
       - "craftos2-lua/**"
       - "craftos2-lua"
       - "resources/CraftOSTest.lua"
+      - "resources/CCT-Tests.patch"
   pull_request:
     paths:
       - "src/**"
@@ -26,7 +27,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Download ROM
-      run: sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
+      run: sudo git clone --branch lua-5.2 https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
     - name: Install dependencies
       run: |
         sudo apt update
@@ -54,7 +55,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Download ROM
-      run: sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
+      run: sudo git clone --branch lua-5.2 https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
     - name: Install dependencies
       run: |
         sudo apt update
@@ -87,7 +88,7 @@ jobs:
         sudo apt install -y libsdl2-dev libsdl2-mixer-dev libhpdf-dev libpng++-dev libwebp-dev libpoco-dev libncurses5-dev nodejs
     - name: Build standalone ROM
       run: |
-        git clone https://github.com/MCJack123/craftos2-rom
+        git clone --branch lua-5.2 https://github.com/MCJack123/craftos2-rom
         cd craftos2-rom
         node ../resources/packStandaloneROM.js
         cd ..
@@ -115,8 +116,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: Download ROM & CC:T
       run: |
-        sudo git clone https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
-        git clone --branch v1.19.4-1.108.0 https://github.com/SquidDev-CC/CC-Tweaked ../CC-Tweaked
+        sudo git clone --branch lua-5.2 https://github.com/MCJack123/craftos2-rom /usr/local/share/craftos
+        git clone --branch v1.20.1-1.109.0 https://github.com/cc-tweaked/CC-Tweaked ../CC-Tweaked
         patch -p1 -d ../CC-Tweaked < resources/CCT-Tests.patch
     - name: Install dependencies
       run: |
@@ -145,7 +146,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Download ROM
-      run: git clone https://github.com/MCJack123/craftos2-rom "C:\Program Files\CraftOS-PC"
+      run: git clone --branch lua-5.2 https://github.com/MCJack123/craftos2-rom "C:\Program Files\CraftOS-PC"
     - name: Restore vcpkg cache
       uses: lukka/run-vcpkg@v10
       with:
@@ -188,8 +189,8 @@ jobs:
         copy x64\Release\CraftOS-PC.pdb CraftOS-PC.pdb
         copy x64\ReleaseC\CraftOS-PC.exe CraftOS-PC_console.exe
         copy x64\ReleaseC\CraftOS-PC.pdb CraftOS-PC_console.pdb
-        copy craftos2-lua\src\lua51.dll lua51.dll
-        copy craftos2-lua\src\lua51.pdb lua51.pdb
+        copy craftos2-lua\src\lua52.dll lua52.dll
+        copy craftos2-lua\src\lua52.pdb lua52.pdb
         # Remove buildtrees that kill the cache
         Remove-Item vcpkg\buildtrees\* -Force -Recurse -ErrorAction SilentlyContinue
     - name: Run CraftOSTest
@@ -210,13 +211,13 @@ jobs:
         path: |
           CraftOS-PC.exe
           CraftOS-PC_console.exe
-          lua51.dll
+          lua52.dll
     - name: Upload artifact symbols
       uses: actions/upload-artifact@v2
       with:
         name: CraftOS-PC-Artifact-Symbols
         path: |
           CraftOS-PC.pdb
           CraftOS-PC_console.pdb
-          lua51.pdb
+          lua52.pdb
   

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "Build",
             "type": "shell",
-            "command": "make -j8",
+            "command": "make",
             "group": {
                 "kind": "build",
                 "isDefault": true

CraftOS-PC 2.vcxproj

@@ -350,7 +350,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51d.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;wer.lib;crypt32.lib;normaliz.lib;SDL2maind.lib;iphlpapi.lib;libpng16d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52d.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;wer.lib;crypt32.lib;normaliz.lib;SDL2maind.lib;iphlpapi.lib;libpng16d.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <AdditionalOptions>/VERBOSE:LIB %(AdditionalOptions)</AdditionalOptions>
       <Profile>true</Profile>
@@ -367,12 +367,13 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
       <DisableSpecificWarnings>26812;4005</DisableSpecificWarnings>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>copy craftos2-lua\src\lua51d.dll x64\Debug\lua51d.dll</Command>
+      <Command>copy craftos2-lua\src\lua52d.dll x64\Debug\lua52d.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -405,7 +406,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
@@ -420,12 +421,13 @@
       <LanguageStandard_C>stdc11</LanguageStandard_C>
       <DisableSpecificWarnings>26812;4005</DisableSpecificWarnings>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>copy craftos2-lua\src\lua51.dll x64\Release\lua51.dll</Command>
+      <Command>copy craftos2-lua\src\lua52.dll x64\Release\lua52.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -456,7 +458,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|x64'">
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
@@ -471,12 +473,13 @@
       <LanguageStandard_C>stdc11</LanguageStandard_C>
       <DisableSpecificWarnings>26812;4005</DisableSpecificWarnings>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>copy craftos2-lua\src\lua51.dll x64\ReleaseStandalone\lua51.dll</Command>
+      <Command>copy craftos2-lua\src\lua52.dll x64\ReleaseStandalone\lua52.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseStandalone|ARM64'">
@@ -507,7 +510,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|x64'">
     <Link>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua51.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;SDL2_mixer.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;lua52.lib;sdl2.lib;shlwapi.lib;ws2_32.lib;wldap32.lib;crypt32.lib;normaliz.lib;SDL2main.lib;SDL2_mixer.lib;iphlpapi.lib;libpng16.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
@@ -522,12 +525,13 @@
       <LanguageStandard_C>stdc17</LanguageStandard_C>
       <DisableSpecificWarnings>26812;4005</DisableSpecificWarnings>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
     </ProjectReference>
     <PostBuildEvent>
-      <Command>copy craftos2-lua\src\lua51.dll x64\ReleaseC\lua51.dll</Command>
+      <Command>copy craftos2-lua\src\lua52.dll x64\ReleaseC\lua52.dll</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseC|ARM64'">

DOCUMENTATION.md

@@ -181,14 +181,14 @@ int multiply(lua_State *L) {
 _declspec(dllexport) 
 #endif
 int luaopen_example(lua_State *L) {
-    struct luaL_reg M[] =
+    struct luaL_Reg M[] =
     {
       {"addition", addition},
       {"multiply", multiply},
       {NULL,NULL}
     };
 
-    luaL_register(L, "example", M);
+    luaL_Register(L, "example", M);
     return 1;
 }
 

api/Computer.hpp

@@ -132,7 +132,7 @@ struct Computer {
     std::mutex openWebsocketsMutex;
     std::vector<std::pair<lua_CFunction, void*>> startupCallbacks; // List of functions to call when starting up + a userdata to pass as the first argument
 
-    // The following fields are available in API version 10.9 and later.
+    // The following fields are available in API version 12.0 and later.
     std::vector<std::filesystem::path> droppedFiles; // List of files that were dropped in the current drop set
 
 private:

api/lib.hpp

@@ -24,9 +24,9 @@ struct Computer;
 
 /// The current version of plugin support.
 #if defined(_WIN32) && defined(_DEBUG)
-#define PLUGIN_VERSION 100010
+#define PLUGIN_VERSION 100012
 #else
-#define PLUGIN_VERSION 10
+#define PLUGIN_VERSION 12
 #endif
 
 /// Most OS's use UTF-8/ASCII for path storage; however, Windows is contrarian and uses UTF-16.

api/peripheral.hpp

@@ -56,9 +56,7 @@ class peripheral {
     virtual int call(lua_State *L, const char * method)=0;
     // This function is deprecated, and no longer works. In fact, it did not work
     // in any version of the API. Just leave this as-is.
-#if __cplusplus >= 201402L
     [[deprecated]]
-#endif
     virtual void update() {}
     // This function should return a library_t containing the names of all of the
     // methods available to the peripheral. Only the keys, name, and size members

examples/ccemux.cpp

@@ -145,11 +145,11 @@ static int ccemux_getVersion(lua_State *L) {
 
 static int ccemux_openEmu(lua_State *L) {
     Computer * comp = get_comp(L);
-    int id = 0;
+    int id = luaL_optinteger(L, 1, -1);
     if (lua_isnumber(L, 1)) id = (int)lua_tointeger(L, 1);
-    else if (!lua_isnoneornil(L, 1)) luaL_typerror(L, 1, "number");
-    else {
+    if (id < 0) {
         std::lock_guard<std::mutex> lock(comp->peripherals_mutex);
+        id = 0;
         while (functions->getComputerById(id) != NULL) id++;
     }
     if (functions->attachPeripheral(comp, "computer_" + std::to_string(id), "computer", NULL, "") == NULL) lua_pushnil(L);
@@ -233,7 +233,7 @@ static int ccemux_detach(lua_State *L) {
     return 0;
 }
 
-static struct luaL_reg M[] = {
+static struct luaL_Reg M[] = {
     {"getVersion", ccemux_getVersion},
     {"openEmu", ccemux_openEmu},
     {"closeEmu", ccemux_closeEmu},
@@ -252,7 +252,7 @@ static PluginInfo info("ccemux", 3);
 
 extern "C" {
 DLLEXPORT int luaopen_ccemux(lua_State *L) {
-    luaL_register(L, lua_tostring(L, 1), M);
+    luaL_newlib(L, M);
     functions->addVirtualMount(get_comp(L), emuROM, "/rom");
     return 1;
 }

examples/ccemux.vcxproj

@@ -146,7 +146,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;SDL2.lib;lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;SDL2.lib;lua52.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -212,7 +212,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;SDL2d.lib;lua51d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;SDL2d.lib;lua52d.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)craftos2-lua\src</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>

examples/plugin_base.cpp

@@ -15,7 +15,7 @@ extern "C" {
 
 // add your functions here...
 
-static luaL_reg M[] = {
+static luaL_Reg M[] = {
     // add functions here as {name, function}...
     {NULL, NULL}
 };
@@ -26,7 +26,7 @@ static PluginInfo info("myplugin");
 extern "C" {
 // replace "myplugin" with the plugin name
 DLLEXPORT int luaopen_myplugin(lua_State *L) {
-    luaL_register(L, "myplugin", M);
+    luaL_newlib(L, M);
     return 1;
 }
 

resources/CCT-Test-Bootstrap.lua

@@ -7,7 +7,7 @@ end
 for _,v in ipairs(fs.list("/")) do if not fs.isReadOnly(v) then fs.delete(v) end end
 _G._CCPC_FIRST_RUN = nil
 _G._CCPC_UPDATED_VERSION = nil
-local logfile = io.open("test-log.txt", "w")
+local logfile = assert(io.open("test-log.txt", "w"))
 io.output(logfile)
 shell.run("/test-rom/mcfly /test-rom/spec")
 logfile:close()

resources/CCT-Tests.patch

@@ -9,7 +9,15 @@ diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/mcfly.l
 diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua b/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua
 --- a/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua	2020-06-29 02:52:34.000000000 -0400
 +++ b/projects/core/src/test/resources/test-rom/spec/apis/fs_spec.lua	2020-06-29 01:24:00.000000000 -0400
-@@ -122,7 +122,7 @@
+@@ -88,7 +88,6 @@
+     describe("fs.list", function()
+         it("fails on files", function()
+             expect.error(fs.list, "rom/startup.lua"):eq("/rom/startup.lua: Not a directory")
+-            expect.error(fs.list, "startup.lua"):eq("/startup.lua: Not a directory")
+         end)
+
+         it("fails on non-existent nodes", function()
+@@ -122,7 +121,7 @@
 
      describe("fs.makeDir", function()
          it("fails on files", function()
@@ -18,7 +26,7 @@ diff -ruN --strip -x .DS_Store projects/core/src/test/resources/test-rom/spec/ap
          end)
 
          it("fails on read-only mounts", function()
-@@ -171,7 +171,7 @@
+@@ -171,7 +170,7 @@
          end)
 
          it("returns the capacity on the root mount", function()

resources/CraftOS-PC.exe.manifest

@@ -3,7 +3,7 @@
   <assemblyIdentity
       type="win32"
       name="CraftOS-PC"
-      version="2.7.6.0"
+      version="2.8.0.0"
       processorArchitecture="*"
     />
   <description>Advanced ComputerCraft Emulator</description>

resources/CraftOSTest.lua

@@ -7,9 +7,9 @@ if config and config.add then
 end
 term.setCursorPos(1, 1)
 term.setTextColor(colors.lightBlue)
-print("CraftOSTest 1.8")
+print("CraftOSTest 1.9")
 term.setTextColor(colors.white)
-if os.version() ~= "CraftOS 1.8" then error("This test is for CraftOS 1.8.") end
+if os.version() ~= "CraftOS 1.9" then error("This test is for CraftOS 1.9.") end
 
 local api_tests = {}
 local api = nil

resources/Info.plist

@@ -21,13 +21,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.6</string>
+	<string>2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSApplicationCategoryType</key>
 	<string>Unknown</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.6</string>
+	<string>2.8</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (C) 2019-2023 JackMacWindows.</string>
 	<key>NSHighResolutionCapable</key>