From 16dc73ccfdea22002a801a762760c4b704304340 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:18:48 -0400 Subject: [PATCH 01/11] Update lint_vba.yml --- .github/workflows/lint_vba.yml | 41 +++++++++++++++------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/.github/workflows/lint_vba.yml b/.github/workflows/lint_vba.yml index c92c127..9024283 100644 --- a/.github/workflows/lint_vba.yml +++ b/.github/workflows/lint_vba.yml @@ -12,28 +12,23 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['8.2'] + python-version: ["3.11"] steps: - - name: Set up PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer:v2 - - - name: Set up Node - uses: actions/setup-node@v1 - with: - node-version: '14.x' - - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: PHP Code Sniffer - run: | - composer require --no-install --no-update beakerboy/vba_tokenizer:dev-master - composer config repositories.beakerboy vcs https://github.com/Beakerboy/VBA_Tokenizer - composer update - vendor/bin/phpcs --extensions=cls/vba,bas/vba,frm/vba --standard=vendor/beakerboy/vba_tokenizer/src/Standards/VBA src/Modules src/ClassModules src/Forms + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install antlr4-tools + - name: Lint with antlr + run: | + # stop the build if there are Python syntax errors or undefined names + antlr4-parse vba.g4 src/ClassModules/*.cls + antlr4-parse vba.g4 src/Modules/*.bas + antlr4-parse vba.g4 src/Forms/*.frm + antlr4-parse vba.g4 testing/ClassModules/*.cls + antlr4-parse vba.g4 testing/Modules/*.bas + From 6ace00bc35a3ff003cb39b8b62059c31d83c2e99 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:26:01 -0400 Subject: [PATCH 02/11] Update lint_vba.yml --- .github/workflows/lint_vba.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint_vba.yml b/.github/workflows/lint_vba.yml index 9024283..ba5d997 100644 --- a/.github/workflows/lint_vba.yml +++ b/.github/workflows/lint_vba.yml @@ -23,6 +23,7 @@ jobs: - name: Install dependencies run: | python -m pip install antlr4-tools + wget https://raw.githubusercontent.com/antlr/grammars-v4/master/vba/vba.g4 - name: Lint with antlr run: | # stop the build if there are Python syntax errors or undefined names From 8b4a85abdb086ce364e4a1a41b43dce1b8cc2d6f Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:34:11 -0400 Subject: [PATCH 03/11] Update lint_vba.yml --- .github/workflows/lint_vba.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint_vba.yml b/.github/workflows/lint_vba.yml index ba5d997..40ff555 100644 --- a/.github/workflows/lint_vba.yml +++ b/.github/workflows/lint_vba.yml @@ -27,9 +27,9 @@ jobs: - name: Lint with antlr run: | # stop the build if there are Python syntax errors or undefined names - antlr4-parse vba.g4 src/ClassModules/*.cls - antlr4-parse vba.g4 src/Modules/*.bas - antlr4-parse vba.g4 src/Forms/*.frm - antlr4-parse vba.g4 testing/ClassModules/*.cls - antlr4-parse vba.g4 testing/Modules/*.bas + antlr4-parse vba.g4 startRule src/ClassModules/*.cls + antlr4-parse vba.g4 startRule src/Modules/*.bas + antlr4-parse vba.g4 startRule src/Forms/*.frm + antlr4-parse vba.g4 startRule testing/ClassModules/*.cls + antlr4-parse vba.g4 startRule testing/Modules/*.bas From 631e80525dcfbf7068790a5bb6551c1bdd32718a Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:37:24 -0400 Subject: [PATCH 04/11] Update lint_vba.yml --- .github/workflows/lint_vba.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_vba.yml b/.github/workflows/lint_vba.yml index 40ff555..5d460da 100644 --- a/.github/workflows/lint_vba.yml +++ b/.github/workflows/lint_vba.yml @@ -26,10 +26,11 @@ jobs: wget https://raw.githubusercontent.com/antlr/grammars-v4/master/vba/vba.g4 - name: Lint with antlr run: | - # stop the build if there are Python syntax errors or undefined names antlr4-parse vba.g4 startRule src/ClassModules/*.cls antlr4-parse vba.g4 startRule src/Modules/*.bas antlr4-parse vba.g4 startRule src/Forms/*.frm + - name: Lint tests with antlr + run: | antlr4-parse vba.g4 startRule testing/ClassModules/*.cls antlr4-parse vba.g4 startRule testing/Modules/*.bas From 04fe937a6822cdf4f0797bbd909c59906e9d1a8e Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:42:59 -0400 Subject: [PATCH 05/11] Update iSQLRecordset.cls From 0a996339c2f82e5abdf646d168f78e43b0c9110f Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:44:03 -0400 Subject: [PATCH 06/11] Update lint_vba.yml --- .github/workflows/lint_vba.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/lint_vba.yml b/.github/workflows/lint_vba.yml index 5d460da..8d9e1d6 100644 --- a/.github/workflows/lint_vba.yml +++ b/.github/workflows/lint_vba.yml @@ -28,7 +28,6 @@ jobs: run: | antlr4-parse vba.g4 startRule src/ClassModules/*.cls antlr4-parse vba.g4 startRule src/Modules/*.bas - antlr4-parse vba.g4 startRule src/Forms/*.frm - name: Lint tests with antlr run: | antlr4-parse vba.g4 startRule testing/ClassModules/*.cls From 1d8c93e1189a25677273060b4e87cf6bfb41c17a Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:45:15 -0400 Subject: [PATCH 07/11] Update iSQLRecordset.cls --- src/ClassModules/iSQLRecordset.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ClassModules/iSQLRecordset.cls b/src/ClassModules/iSQLRecordset.cls index e23908e..830fa81 100644 --- a/src/ClassModules/iSQLRecordset.cls +++ b/src/ClassModules/iSQLRecordset.cls @@ -36,7 +36,7 @@ Public Function State() End Function -' Property: EOF +' Property: EOB Public Property EOF() End Property From f2886889aea22e6bf7ba21ef7ca5fc75b8036110 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:47:45 -0400 Subject: [PATCH 08/11] Update iSQLRecordset.cls From 2707e47aca2700da2cb10e61783598b41e5f7b69 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:48:21 -0400 Subject: [PATCH 09/11] Update iSQLRecordset.cls --- src/ClassModules/iSQLRecordset.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ClassModules/iSQLRecordset.cls b/src/ClassModules/iSQLRecordset.cls index 830fa81..d55258f 100644 --- a/src/ClassModules/iSQLRecordset.cls +++ b/src/ClassModules/iSQLRecordset.cls @@ -37,6 +37,6 @@ Public Function State() End Function ' Property: EOB -Public Property EOF() +Public Property EOB() End Property From 4302d7a278b03ec93479cadb6a789cda8991b2c2 Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:52:47 -0400 Subject: [PATCH 10/11] Update iSQLRecordset.cls --- src/ClassModules/iSQLRecordset.cls | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ClassModules/iSQLRecordset.cls b/src/ClassModules/iSQLRecordset.cls index d55258f..2aac995 100644 --- a/src/ClassModules/iSQLRecordset.cls +++ b/src/ClassModules/iSQLRecordset.cls @@ -35,8 +35,3 @@ End Function Public Function State() End Function - -' Property: EOB -Public Property EOB() - -End Property From 258b4d186a1a7b4bc70806a18f63e3f7eca50a5e Mon Sep 17 00:00:00 2001 From: Kevin Nowaczyk Date: Mon, 30 Oct 2023 11:58:06 -0400 Subject: [PATCH 11/11] Update iSQLRecordset.cls --- src/ClassModules/iSQLRecordset.cls | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/ClassModules/iSQLRecordset.cls b/src/ClassModules/iSQLRecordset.cls index 2aac995..c5eabf0 100644 --- a/src/ClassModules/iSQLRecordset.cls +++ b/src/ClassModules/iSQLRecordset.cls @@ -35,3 +35,8 @@ End Function Public Function State() End Function + +' Property: EOF +Property Get EOF() + +End Property