From 3f370047e29e17d5f8094d6dc9eeadf3e5e7753c Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Fri, 23 Feb 2024 10:24:26 +0200 Subject: [PATCH] build: update & regenerate grammar --- .gitattributes | 2 +- .gitignore | 1 - Cargo.toml | 2 +- binding.gyp | 4 ++-- bindings/rust/build.rs | 6 ++---- package-lock.json | 34 ++++++++++++++++++++++++++++++++++ package.json | 10 +++++----- src/grammar.json | 1 - 8 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 package-lock.json diff --git a/.gitattributes b/.gitattributes index c472c1a..4eb6b22 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,4 @@ -* text=auto +* text eol=lf src/** linguist-generated bindings/** linguist-generated diff --git a/.gitignore b/.gitignore index f4be042..a3d18fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ node_modules/ -package-lock.json yarn.lock Cargo.lock diff --git a/Cargo.toml b/Cargo.toml index 2132990..f269fe9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tree-sitter-poe-filter" description = "poe-filter grammar for the tree-sitter parsing library" -version = "0.3.0" +version = "0.3.1" keywords = ["incremental", "parsing", "poe-filter"] categories = ["parsing", "text-editors"] repository = "https://github.com/tree-sitter-grammars/tree-sitter-poe-filter" diff --git a/binding.gyp b/binding.gyp index 6cb0e49..d81143a 100644 --- a/binding.gyp +++ b/binding.gyp @@ -12,10 +12,10 @@ ], "cflags_c": [ "-std=c99", - "-Wno-unused-but-set-variable" + "-Wno-parentheses" ], "cflags_cc": [ - "-Wno-cast-function-type" + "-Wno-cast-function-type", ] } ] diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs index a1a8927..fbc6f86 100644 --- a/bindings/rust/build.rs +++ b/bindings/rust/build.rs @@ -3,10 +3,8 @@ fn main() { let mut c_config = cc::Build::new(); c_config.include(src_dir); - c_config - .flag_if_supported("-Wno-unused-parameter") - .flag_if_supported("-Wno-unused-but-set-variable") - .flag_if_supported("-Wno-parentheses"); + c_config.flag_if_supported("-Wno-parentheses"); + let parser_path = src_dir.join("parser.c"); c_config.file(&parser_path); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..98ecc5d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,34 @@ +{ + "name": "tree-sitter-poe-filter", + "version": "0.3.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "tree-sitter-poe-filter", + "version": "0.3.1", + "license": "MIT", + "dependencies": { + "nan": "^2.18.0" + }, + "devDependencies": { + "tree-sitter-cli": "~0.21.0" + } + }, + "node_modules/nan": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==" + }, + "node_modules/tree-sitter-cli": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.21.0.tgz", + "integrity": "sha512-wA7wT5724fNQW82XDH6zT6ZcYonjrAKLCHHuhLsPcAKULrhp3rNuMvlgBdB5FUBvmjHNhtTZF/qpHenMoRJPBw==", + "dev": true, + "hasInstallScript": true, + "bin": { + "tree-sitter": "cli.js" + } + } + } +} diff --git a/package.json b/package.json index 405a174..13fcc98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tree-sitter-poe-filter", - "version": "0.3.0", + "version": "0.3.1", "license": "MIT", "description": "PoE filter grammar for tree-sitter", "repository": "ObserverOfTime/tree-sitter-poe-filter", @@ -12,11 +12,11 @@ "keywords": [ "tree-sitter", "parser", - "lexer" + "lexer", + "poe" ], "scripts": { - "generate": "tree-sitter generate", - "highlight": "tree-sitter highlight", + "build": "tree-sitter generate --no-bindings", "parse": "tree-sitter parse", "test": "tree-sitter test" }, @@ -25,7 +25,7 @@ "nan": "^2.18.0" }, "devDependencies": { - "tree-sitter-cli": "~0.21.0-pre-release-1" + "tree-sitter-cli": "~0.21.0" }, "tree-sitter": [ { diff --git a/src/grammar.json b/src/grammar.json index 0b61709..3ee8f8f 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -2894,4 +2894,3 @@ ], "supertypes": [] } -