#132 Port remaining grammar tests to C++

.github/workflows/cmake.yml

@@ -3,8 +3,14 @@ name: CMake
 on:
   push:
     branches: ["main"]
+    paths:
+      - "ports/cpp/**"
+      - ".github/workflows/*"
   pull_request:
     branches: ["main"]
+    paths:
+      - "ports/cpp/**"
+      - ".github/workflows/*"
 
 jobs:
   build:
@@ -14,8 +20,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install Build Essential
-        run: sudo apt update && sudo apt install build-essential
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install build-essential
       - name: Setup ccache
         uses: hendrikmuhs/[email protected]
         with:

.github/workflows/nodejs.yml

@@ -6,8 +6,10 @@ name: Build & Test
 on:
   push:
     branches: [ main ]
+    paths-ignore: ["ports/**"]
   pull_request:
     branches: [ main ]
+    paths-ignore: ["ports/**"]
 
 jobs:
   build:

ports/cpp/.vscode/launch.json

@@ -5,7 +5,7 @@
             "type": "lldb",
             "request": "launch",
             "name": "Debug Test",
-            "program": "${workspaceFolder}/build/test/${fileDirnameBasename}/antlr4-c3-test",
+            "program": "${workspaceFolder}/build/test/${fileDirnameBasename}/antlr4-c3-test-${fileDirnameBasename}",
             "args": [],
             "cwd": "${workspaceFolder}",
             "preLaunchTask": "Build All"

ports/cpp/README.md

@@ -14,7 +14,7 @@ Please see the parent [README.md](../../readme.md) for an explanation of the lib
 
 ## Requirements
 
-- [C++ 23 standard](https://en.cppreference.com/w/cpp/23) to compile sources.
+- [C++ 20 standard](https://en.cppreference.com/w/cpp/20) to compile sources.
 
 - [ANTLRv4 C++ Runtime](https://github.com/antlr/antlr4/tree/4.13.1/runtime/Cpp) to compile sources.
 

ports/cpp/cmake/CompileOptions.cmake

@@ -1,4 +1,4 @@
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

ports/cpp/cmake/Testing.cmake

@@ -1,4 +1,9 @@
 macro(define_grammar_test grammar)
+    get_filename_component(
+        ANTLR4C3_CURRENT_DIR_NAME
+        ${CMAKE_CURRENT_LIST_DIR} NAME
+    )
+
     antlr_generate(
         ${CMAKE_CURRENT_LIST_DIR}/${grammar}
         ${CMAKE_CURRENT_BINARY_DIR}
@@ -11,19 +16,25 @@ macro(define_grammar_test grammar)
         ${CMAKE_CURRENT_BINARY_DIR}/*.cpp
     )
 
-    add_executable(${PROJECT_NAME}-test ${SOURCE})
+    set(
+        ANTLR4C3_TEST_TARGET
+        ${PROJECT_NAME}-test-${ANTLR4C3_CURRENT_DIR_NAME}
+    )
+
+    add_executable(${ANTLR4C3_TEST_TARGET} ${SOURCE})
 
     target_include_directories(
-        ${PROJECT_NAME}-test PRIVATE
+        ${ANTLR4C3_TEST_TARGET} PRIVATE
         ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_LIST_DIR}/..
     )
 
     target_link_libraries(
-        ${PROJECT_NAME}-test PRIVATE
+        ${ANTLR4C3_TEST_TARGET} PRIVATE
         ${PROJECT_NAME}
         GTest::gtest_main
         GTest::gmock
     )
 
-    gtest_discover_tests(${PROJECT_NAME}-test)
+    gtest_discover_tests(${ANTLR4C3_TEST_TARGET})
 endmacro()

ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp

@@ -181,7 +181,7 @@ class CodeCompletionCore
 	 * @returns The collection of completion candidates. If cancelled or timed out, the returned collection will have its 'cancelled'
 	 *          value set to true and the collected candidates may be incomplete.
 	 */
-	CandidatesCollection collectCandidates(size_t caretTokenIndex, antlr4::ParserRuleContext * context, size_t timeoutMS, std::atomic<bool> * cancel);
+	CandidatesCollection collectCandidates(size_t caretTokenIndex, antlr4::ParserRuleContext * context = nullptr, size_t timeoutMS = 0, std::atomic<bool> * cancel = nullptr);
 
 
 

ports/cpp/test/CMakeLists.txt

@@ -3,3 +3,5 @@ add_compile_options(-Wno-unused-parameter)
 
 enable_testing()
 add_subdirectory(expr)
+add_subdirectory(whitebox)
+add_subdirectory(cpp14)

ports/cpp/test/cpp14/CMakeLists.txt

@@ -0,0 +1 @@
+define_grammar_test(CPP14.g4)