Merge remote-tracking branch 'origin/master'

Author: X39

.github/workflows/ci.yml

@@ -15,17 +15,18 @@ jobs:
           CC: gcc-9
           CXX: g++-9
 
-      - name: Run SQF-VM Tests
-        run: build/sqfvm -a --no-execute-print -i tests/config.cpp -i tests/runTests.sqf
-
       - name: Upload Linux x64 binaries
         uses: actions/upload-artifact@v2
         with:
           name: sqfvm_linux_x64_gcc
           path: build/sqfvm*
 
+      - name: Run SQF-VM Tests
+        working-directory: build
+        run: ctest --output-on-failure
+
       - name: Run CBA A3 Tests
-        run: PATH=build:$PATH python tests/cba_a3.py
+        run: PATH=build:$PATH python tests/cba/cba_a3.py
 
   linux_x64_clang:
     name: Linux x64 (Clang)
@@ -39,17 +40,18 @@ jobs:
           CC: clang
           CXX: clang++
 
-      - name: Run SQF-VM Tests
-        run: build/sqfvm -a --no-execute-print -i tests/config.cpp -i tests/runTests.sqf
-
       - name: Upload Linux x64 binaries
         uses: actions/upload-artifact@v2
         with:
           name: sqfvm_linux_x64_clang
           path: build/sqfvm*
 
+      - name: Run SQF-VM Tests
+        working-directory: build
+        run: ctest --output-on-failure
+
       - name: Run CBA A3 Tests
-        run: PATH=build:$PATH python tests/cba_a3.py
+        run: PATH=build:$PATH python tests/cba/cba_a3.py
 
   macos:
     name: macOS
@@ -59,18 +61,19 @@ jobs:
 
       - name: Build macOS
         run: mkdir build && cd build && cmake .. && cmake --build . --parallel 2
-
-      - name: Run SQF-VM Tests
-        run: build/sqfvm -a --no-execute-print -i tests/config.cpp -i tests/runTests.sqf
 
       - name: Upload macOS binaries
         uses: actions/upload-artifact@v2
         with:
           name: sqfvm_macos
           path: build/sqfvm*
 
+      - name: Run SQF-VM Tests
+        working-directory: build
+        run: ctest --output-on-failure
+
       - name: Run CBA A3 Tests
-        run: PATH=build:$PATH python tests/cba_a3.py
+        run: PATH=build:$PATH python tests/cba/cba_a3.py
 
   windows_win32:
     name: Windows Win32
@@ -81,19 +84,20 @@ jobs:
       - name: Build Windows Win32
         run: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A Win32 .. && cmake --build . --config Release
 
-      - name: Run SQF-VM Tests
-        run: build/Release/sqfvm.exe -a --no-execute-print -i tests/config.cpp -i tests/runTests.sqf
-
       - name: Upload Windows Win32 binaries
         uses: actions/upload-artifact@v2
         with:
           name: sqfvm_windows_win32
           path: build/Release/*.exe
 
+      - name: Run SQF-VM Tests
+        working-directory: build
+        run: ctest --output-on-failure -C Release
+
       - name: Run CBA A3 Tests
         run: |
           $env:Path += ";build/Release/"
-          python tests/cba_a3.py
+          python tests/cba/cba_a3.py
 
   windows_x64:
     name: Windows x64
@@ -104,16 +108,17 @@ jobs:
       - name: Build Windows x64
         run: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 .. && cmake --build . --config Release
 
-      - name: Run SQF-VM Tests
-        run: build/Release/sqfvm.exe -a --no-execute-print -i tests/config.cpp -i tests/runTests.sqf
-
       - name: Upload Windows x64 binaries
         uses: actions/upload-artifact@v2
         with:
           name: sqfvm_windows_x64
           path: build/Release/*.exe
 
+      - name: Run SQF-VM Tests
+        working-directory: build
+        run: ctest --output-on-failure -C Release
+
       - name: Run CBA A3 Tests
         run: |
           $env:Path += ";build/Release/"
-          python tests/cba_a3.py
+          python tests/cba/cba_a3.py

.gitignore

@@ -354,5 +354,5 @@ build/git_sha1\.cpp
 
 *.diagsession
 src/sqc/parser.output
-
-/tests/cba_a3/
+/tests/_out1_.txt
+/tests/_err1_.txt

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16)
 project(sqfvm)
 
 set(CMAKE_CXX_STANDARD 17)
@@ -11,7 +11,10 @@ if (MSVC)
   add_definitions(/MP /W4 /wd4100)
 else()
   add_definitions(-Wall -Wno-unknown-pragmas)
-  add_link_options(-static-libstdc++ -static-libgcc)
+
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_link_options(-static-libstdc++ -static-libgcc)
+  endif()
 endif()
 
 # Add the filesystem library if we are building on Clang or GCC

sqf-dummy-check/gen.sqf

@@ -0,0 +1,26 @@
+// call compileScript ["gen.sqf"];
+// ..\build\Release\sqfvm.exe --input-sqf .\delta.sqf
+
+private _ops_list =
+#include "ops.sqf"
+;
+
+private _toAdd = [];
+(supportInfo "") apply {
+	if (_x == "b:SWITCH : CODE") then { continue };
+	if (_x == "b:SWITCH do CODE") then { continue };
+	_x splitString ":" params ["_t", "_x"];
+	if (_t != "t") then {
+		_x = _x splitString " ";
+		private _cmd = switch count _x do {
+			case 1: { ["n", (_x # 0)] };
+			case 2: { ["u", (_x # 0)] };
+			case 3: { ["b", (_x # 1), 4] };
+		};
+        if ((_ops_list findIf {(_x select [0,2]) isEqualTo (_cmd select [0,2])}) == -1) then {
+            _toAdd pushBackUnique str _cmd;
+        };
+	};
+};
+copyToClipboard (_toAdd apply {format ["%1,", _x]} joinString endl);
+format ["found %1", count _toAdd];

sqf-dummy-check/ops.sqf

@@ -287,6 +287,18 @@
 ["n", "isstreamfriendlyuienabled"],
 ["n", "confignull"],
 ["n", "get3deniconsvisible"],
+["n","savemissionprofilenamespace"],
+["n","issteamoverlayenabled"],
+["n","issaving"],
+["n","gettiparameters"],
+["n","ismissionprofilenamespaceloaded"],
+["n","getterraininfo"],
+["n","missionprofilenamespace"],
+["n","getpipviewdistance"],
+["n","rainparams"],
+["n","getvideooptions"],
+["n","allenv3dsoundsources"],
+
 ["u", "showradio"],
 ["u", "vectorup"],
 ["u", "lnbsetcurselrow"],
@@ -1507,6 +1519,52 @@
 ["u", "get3denentityid"],
 ["u", "menusort"],
 ["u", "menusettext"],
+["u","displayuniquename"],
+["u","getallenv3dsoundcontrollers"],
+["u","setterrainheight"],
+["u","activetitleeffectparams"],
+["u","geteventhandlerinfo"],
+["u","getforcedspeed"],
+["u","freeextension"],
+["u","assignedgroup"],
+["u","gettowparent"],
+["u","sethumidity"],
+["u","insidebuilding"],
+["u","setpipviewdistance"],
+["u","inputmouse"],
+["u","inputmouse"],
+["u","getturretopticsmode"],
+["u","needservice"],
+["u","loadconfig"],
+["u","ropesattachedto"],
+["u","getunitfreefallinfo"],
+["u","getcorpse"],
+["u","getunloadincombat"],
+["u","collisiondisabledwith"],
+["u","groups"],
+["u","actionkeysex"],
+["u","isallowedcrewinimmobile"],
+["u","action"],
+["u","playsoundui"],
+["u","getobjectid"],
+["u","nearestmines"],
+["u","compatibleitems"],
+["u","equipmentdisabled"],
+["u","isawake"],
+["u","settiparameter"],
+["u","ctrlshadow"],
+["u","assignedvehicles"],
+["u","setrain"],
+["u","setrain"],
+["u","allowedservice"],
+["u","compatiblemagazines"],
+["u","inputcontroller"],
+["u","displayupdate"],
+["u","brakesdisabled"],
+["u","getterrainheight"],
+["u","ctrlurloverlaymode"],
+["u","pose"],
+
 ["b", "lnbsetcurselrow", 4],
 ["b", "removemenuitem", 4],
 ["b", "currentzeroing", 4],
@@ -2620,5 +2678,31 @@
 ["b", "ctrlsetfontheighth4", 4],
 ["b", "ctrlsetfontheighth5", 4],
 ["b", "menusort", 4],
-["b", "menusettext", 4]
+["b", "menusettext", 4],
+["b","setturretlimits", 4],
+["b","getenv3dsoundcontroller", 4],
+["b","ctrlseturloverlaymode", 4],
+["b","geteventhandlerinfo", 4],
+["b","allowservice", 4],
+["b","getturretlimits", 4],
+["b","setturretopticsmode", 4],
+["b","reload", 4],
+["b","islaseron", 4],
+["b","allobjects", 4],
+["b","getturretopticsmode", 4],
+["b","findany", 4],
+["b","getordefaultcall", 4],
+["b","ctrlat", 4],
+["b","getopticsmode", 4],
+["b","setopticsmode", 4],
+["b","disablebrakes", 4],
+["b","setunitfreefallheight", 4],
+["b","lasertarget", 4],
+["b","isequalref", 4],
+["b","weaponsinfo", 4],
+["b","ctrlsetshadow", 4],
+["b","isnotequalref", 4],
+["b","awake", 4],
+["b","getdirvisual", 4],
+["b","alldiaryrecords", 4]
 ]