From 6cf83872446e827b493f1a129eb06694d838ca34 Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Thu, 11 Mar 2021 13:26:28 +0100 Subject: [PATCH 1/2] Run tests from scratch when a grammar is generated --- generate-grammars/generate-grammar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-grammars/generate-grammar.sh b/generate-grammars/generate-grammar.sh index 1b16e440e..245858a6d 100755 --- a/generate-grammars/generate-grammar.sh +++ b/generate-grammars/generate-grammar.sh @@ -39,4 +39,4 @@ cargo fmt # Run rust code-analysis to verify if everything works correctly and to # update the Cargo.lock -cargo test --workspace +cargo clean && cargo test --workspace From ab9464cc8d75004951302134ae362b8f8e69a26f Mon Sep 17 00:00:00 2001 From: Luni-4 Date: Thu, 11 Mar 2021 15:28:01 +0100 Subject: [PATCH 2/2] Deduplicate code for grammars generators scripts --- generate-grammars/generate-mozcpp.sh | 36 ++++------------------------ generate-grammars/generate-mozjs.sh | 36 ++++------------------------ 2 files changed, 8 insertions(+), 64 deletions(-) diff --git a/generate-grammars/generate-mozcpp.sh b/generate-grammars/generate-mozcpp.sh index 1e16e43dd..007ed6f7b 100755 --- a/generate-grammars/generate-mozcpp.sh +++ b/generate-grammars/generate-mozcpp.sh @@ -31,39 +31,11 @@ popd # Copy tree-sitter-cpp `scanner.cc` functions into the `src` directory cp --verbose tree-sitter-cpp/src/scanner.cc ./src/scanner.cc -# Init npm -npm init -y - -# Install a small module that lets the parser be used from Node -npm install --save nan - -# Install the Tree-sitter CLI -npm install --save-dev tree-sitter-cli - -# Generate moz-cpp grammar -./node_modules/.bin/tree-sitter generate - -# Delete node_modules -rm -rf node_modules - -# Delete tree-sitter-cpp directory -rm -rf tree-sitter-cpp - # Exit tree-sitter-mozcpp directory popd -# Enter enums directory -pushd enums - -# Recreate the grammar for rust-code-analysis -cargo clean && cargo run -- -lrust -o ../src/languages - -# Exit enums directory -popd - -# Format the produced grammars -cargo fmt +# Generate tree-sitter-mozcpp grammar +./generate-grammars/generate-grammar.sh tree-sitter-mozcpp -# Run rust code-analysis to verify if everything works correctly and to -# update the Cargo.lock -cargo test --workspace +# Delete tree-sitter-mozcpp/tree-sitter-cpp directory +rm -rf ./tree-sitter-mozcpp/tree-sitter-cpp diff --git a/generate-grammars/generate-mozjs.sh b/generate-grammars/generate-mozjs.sh index 4dc165aab..9c8c3ba7e 100755 --- a/generate-grammars/generate-mozjs.sh +++ b/generate-grammars/generate-mozjs.sh @@ -35,39 +35,11 @@ popd SED_PATTERN="s/tree_sitter_javascript_external_scanner_/tree_sitter_javascript_external_scanner_mozjs_/g" sed $SED_PATTERN tree-sitter-javascript/src/scanner.c > ./src/tree_sitter_javascript_scanner.c -# Init npm -npm init -y - -# Install a small module that lets the parser be used from Node -npm install --save nan - -# Install the Tree-sitter CLI -npm install --save-dev tree-sitter-cli - -# Generate moz-cpp grammar -./node_modules/.bin/tree-sitter generate - -# Delete node_modules -rm -rf node_modules - -# Delete tree-sitter-javascript directory -rm -rf tree-sitter-javascript - # Exit tree-sitter-mozjs directory popd -# Enter enums directory -pushd enums - -# Recreate the grammar for rust-code-analysis -cargo clean && cargo run -- -lrust -o ../src/languages - -# Exit enums directory -popd - -# Format the produced grammars -cargo fmt +# Generate tree-sitter-mozjs grammar +./generate-grammars/generate-grammar.sh tree-sitter-mozjs -# Run rust code-analysis to verify if everything works correctly and to -# update the Cargo.lock -cargo test --workspace +# Delete tree-sitter-mozjs/tree-sitter-javascript directory +rm -rf ./tree-sitter-mozjs/tree-sitter-javascript