[refactor] Simplify regex

.github/workflows/CI.yml

@@ -0,0 +1,33 @@
+name: CI
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  run-tests:
+    if: github.repository_owner == 'olemorud'
+
+    permissions:
+      contents: read
+    
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: npm install
+        run: npm ci
+
+      - name: Run unit tests
+        run: npm run test
+
+      - name: Apply problem matcher
+        uses: ./
+        with:
+          build-directory: ""
+      
+      - name: Test problem matcher
+        run: |
+          ls
+          cat dist/gcc_matcher.json
+          cp -r test build
+          gcc -Wall -Wextra -O0 build/generate_warnings.c

.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+*/gcc_matcher.json
+*/a.out
+.vscode/

README.md

@@ -1,12 +1,21 @@
 # GCC problem matcher
 
+# DO NOT COMMIT THIS LINE
+
 Creates annotations for warnings and errors in gcc builds.
 
+## Inputs
 
-## Usage
+### root
 
-Just add a single line before running the build step.
+**Optional** Base directory for build. For builds done in a subdirectory, this should match that directory, otherwise the pattern match will not be able to point to the correct file.
+
+## Example usage
+
+Just add this line anywhere before running the build step.
 
 ```yaml
     - uses: olemorud/gcc-problem-matcher@master
+      with:
+        root: /workspace/build
 ```

action.yml

@@ -9,11 +9,10 @@ branding:
   color: yellow
 
 inputs:
-  root:
+  build-directory:
     description: 'base directory for build, e.g. /workdir/build'
-    required: false
-    default: ''
+    required: true
 
 runs:
   using: 'node16'
-  main: 'src/index.js'
+  main: 'dist/index.js'

dist/gcc_matcher.jsontemplate

@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^\\s*${{ BASE }}\/?(.*?):(\\d+):(\\d+):.*?(warning|error): (.*)$"
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

package-lock.json

@@ -0,0 +1,77 @@
+{
+  "name": "gcc-problem-matcher",
+  "version": "1.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "gcc-problem-matcher",
+      "version": "1.0.0",
+      "dependencies": {
+        "@actions/core": "^1.10.0"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+      "dependencies": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
+      "dependencies": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    }
+  },
+  "dependencies": {
+    "@actions/core": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
+      "requires": {
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
+      }
+    },
+    "@actions/http-client": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
+      "requires": {
+        "tunnel": "^0.0.6"
+      }
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+    }
+  }
+}

package.json

@@ -0,0 +1,26 @@
+{
+  "name": "gcc-problem-matcher",
+  "version": "1.0.0",
+  "description": "Creates annotations for warnings and errors in gcc builds.",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "node --test",
+    "build": "ncc build src/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/olemorud/gcc-problem-matcher.git"
+  },
+  "keywords": [],
+  "author": "",
+  "bugs": {
+    "url": "https://github.com/olemorud/gcc-problem-matcher/issues"
+  },
+  "homepage": "https://github.com/olemorud/gcc-problem-matcher#readme",
+  "dependencies": {
+    "@actions/core": "^1.10.0"
+  }
+}

src/gcc_matcher.jsontemplate

@@ -4,7 +4,7 @@
             "owner": "gcc-problem-matcher",
             "pattern": [
                 {
-                    "regexp": "^${{ BASE }}\/?(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "regexp": "^\\s*${{ BASE }}\/?(.*?):(\\d+):(\\d+):.*?(warning|error): (.*)$"
                     "file": 1,
                     "line": 2,
                     "column": 3,

src/index.js

@@ -1,33 +1,45 @@
 const path = require('path');
 const fs = require('node:fs');
-//const core = require('@actions/core');
+const core = require('@actions/core');
 
-// C:\Users\ => C\:\\Users\\
+// escapeRegExp :: string => string
+// escape all characters with special meanings in regexp
 const escapeRegExp = (s) =>
-	s.replace(/[:.*+?^${}()|\/[\]\\]/g, "\\$&");
+	s.replace(/[/\-^$*+?.()|[\]{}]/g, "\\$&");
 
-
-// ${{ key }}, ${{var}}, ${{ aggqq43g3qg4 }}
+// variable :: string => RegExp
+// create regex to match ${{ key }}
 const variable = (key) =>
 	new RegExp("\\${{\\s*?" + key + "\\s*?}}", "g");
 
-
-// default value set in /action.yml
-// const root = core.getInput('root', { required: false });
-root = '/tmp/workspace';
-
+// templatePath :: string
 const templatePath = path.join(__dirname, "gcc_matcher.jsontemplate");
 
-const parsed = 
-	fs.readFileSync(templatePath, "ascii")
-		.replace(variable("BASE"), escapeRegExp(root));
-
+// matcherPath :: string
 const matcherPath = path.join(__dirname, "gcc_matcher.json");
 
+// rootdir :: string
+const rootdir = core.getInput('build-directory', {required: false});
+
+// parse :: IO() => IO() => Error | null
+const parse = (templatePath) => (matcherPath) => {
+	const content = fs.readFileSync(templatePath, 'utf-8');
+
+	const parsed = content.replace(variable("BASE"), escapeRegExp(rootdir));
+
 	fs.writeFileSync(matcherPath, parsed);
 
 	console.log('::add-matcher::' + matcherPath);
+}
 
-/* for testing */ 
+// main:
+try {
+	parse(templatePath)(matcherPath);
+} catch (err) {
+	core.setFailed(`Action failed with error ${err}`)
+}
+
+
+// for testing
 exports.escapeRegExp = escapeRegExp
 exports.variable = variable;

test/generate_warnings.c

@@ -0,0 +1,18 @@
+x;
+
+bad_code(float n) {
+
+    int small[3];
+
+    char index = 10;
+
+    x = small[index];
+
+    return bad_code(x);
+}
+
+
+main() {
+
+    printf("%f %s", bad_code(1.0f));
+}

test/unittest.js

@@ -2,7 +2,7 @@ const assert = require('node:assert');
 const test = require('node:test');
 const _testing = require('../src/index');
 
-test('regex escaping test', () => {
+test('regex escaping test', {skip: true}, () => {
     const escapeRegExp = _testing.escapeRegExp;
 
     const st = [