tree-sitter-sed 0.15.0 → 0.16.0

package/Cargo.toml

@@ -1,43 +1,23 @@
 [package]
-authors = ["konomanoasa"]
-autoexamples = false
-categories = ["parser-implementations", "parsing", "text-editors"]
-description = "Tree-sitter grammars for POSIX sed."
-edition = "2024"
-keywords = ["incremental", "parsing", "tree-sitter", "sed"]
-license = "MIT"
 name = "tree-sitter-sed"
-publish = false
-readme = "README.md"
-repository = "https://github.com/konomanoasa/tree-sitter-sed"
-version = "0.15.0"
-
+version = "0.16.0"
+edition = "2024"
 build = "bindings/rust/build.rs"
-include = [
-  "/LICENSE",
-  "/README.md",
-  "/bindings/rust/*.rs",
-  "/common/scanner.h",
-  "/queries/*.scm",
-  "/sed_ere/queries/*.scm",
-  "/sed_ere/src/node-types.json",
-  "/sed_ere/src/parser.c",
-  "/sed_ere/src/scanner.c",
-  "/sed_ere/src/tree_sitter/*.h",
-  "/src/node-types.json",
-  "/src/parser.c",
-  "/src/scanner.c",
-  "/src/tree_sitter/*.h",
-]
+links = "tree-sitter-sed"
+publish = false
 
 [lib]
 path = "bindings/rust/lib.rs"
 
-[dependencies]
-tree-sitter-language = "0.1"
+[[test]]
+name = "bindings"
+path = "test/bindings.test.rs"
 
-[build-dependencies]
-cc = "1.2"
+[dependencies]
+tree-sitter-language = "0.1.8"
 
 [dev-dependencies]
 tree-sitter = "0.27.0"
+
+[build-dependencies]
+cc = "1.4"

package/README.md

@@ -1,39 +1,37 @@
 # tree-sitter-sed
 
-[![CI](https://github.com/konomanoasa/tree-sitter-sed/actions/workflows/ci.yml/badge.svg)](https://github.com/konomanoasa/tree-sitter-sed/actions/workflows/ci.yml)
+[![CI](https://github.com/konomanoasa/tree-sitter-sed/actions/workflows/ci.yaml/badge.svg)](https://github.com/konomanoasa/tree-sitter-sed/actions/workflows/ci.yaml)
 [![npm](https://img.shields.io/npm/v/tree-sitter-sed)](https://www.npmjs.com/package/tree-sitter-sed)
 
 [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammars for
-POSIX.1-2024 `sed`.
+POSIX.1-2024 sed.
 
 ## Installation
 
-### npm
-
 ```sh
 npm install tree-sitter-sed
 ```
 
 ## Grammars
 
-This repository contains the following two grammars.
-
-| Grammar   | Regexp | Rust constant  |
-| --------- | ------ | -------------- |
-| `sed`     | BRE    | `LANGUAGE`     |
-| `sed_ere` | ERE    | `LANGUAGE_ERE` |
+| Grammar | Description | Rust constant |
+| --- | --- | --- |
+| `sed` | POSIX.1-2024 sed with BRE | `LANGUAGE` |
+| `sed_ere` | POSIX.1-2024 sed with ERE | `LANGUAGE_ERE` |
 
 ## Development
 
+Development requires Node.js 24.2.0 or later.
+
 ```sh
 npm install
-npm run parse -- script.sed
-npm run parse:ere -- script.sed
+npm run build
+npm test
 ```
 
 ## Specifications
 
-- [POSIX.1-2024 `sed`](https://pubs.opengroup.org/onlinepubs/9799919799.2024edition/utilities/sed.html)
+- [POSIX.1-2024 sed](https://pubs.opengroup.org/onlinepubs/9799919799.2024edition/utilities/sed.html)
 - [POSIX.1-2024 regular expressions](https://pubs.opengroup.org/onlinepubs/9799919799.2024edition/basedefs/V1_chap09.html)
 
 ## License

package/bindings/rust/build.rs

@@ -1,50 +1,31 @@
-use std::path::Path;
+use std::{env, path::Path};
 
-fn compile_parser(
-  source_dir: &Path,
-  library_name: &str,
-  wasm_headers: Option<&Path>,
-) {
-  let parser_path = source_dir.join("parser.c");
-  let scanner_path = source_dir.join("scanner.c");
-  let mut c_config = cc::Build::new();
-  c_config.std("c17").include(source_dir);
-
-  if c_config.get_compiler().is_like_msvc() {
-    c_config.flag("-utf-8");
+fn main() {
+  let mut build = cc::Build::new();
+  build.std("c17");
+  if build.get_compiler().is_like_msvc() {
+    build.flag("-utf-8");
   }
-
-  if let Some(headers) = wasm_headers {
-    c_config.include(headers);
-    println!("cargo:rerun-if-changed={}", headers.display());
+  if env::var("TARGET").expect("Cargo must provide TARGET")
+    == "wasm32-unknown-unknown"
+  {
+    let headers = env::var_os("DEP_TREE_SITTER_LANGUAGE_WASM_HEADERS")
+      .expect("tree-sitter-language must provide WebAssembly headers");
+    build.include(&headers);
+    println!("cargo::rerun-if-changed={}", Path::new(&headers).display());
   }
 
-  c_config.file(&parser_path).file(&scanner_path);
-  c_config.compile(library_name);
-
-  println!("cargo:rerun-if-changed={}", parser_path.display());
-  println!("cargo:rerun-if-changed={}", scanner_path.display());
-  println!(
-    "cargo:rerun-if-changed={}",
-    source_dir.join("tree_sitter").display()
-  );
-}
-
-fn main() {
-  let target = std::env::var("TARGET").expect("Cargo must provide TARGET");
-  let wasm_headers = (target == "wasm32-unknown-unknown").then(|| {
-    std::env::var_os("DEP_TREE_SITTER_LANGUAGE_WASM_HEADERS")
-      .map(std::path::PathBuf::from)
-      .expect(
-        "tree-sitter-language must provide headers for wasm32-unknown-unknown",
-      )
-  });
-
-  compile_parser(Path::new("src"), "tree-sitter-sed", wasm_headers.as_deref());
-  compile_parser(
-    Path::new("sed_ere/src"),
-    "tree-sitter-sed-ere",
-    wasm_headers.as_deref(),
-  );
-  println!("cargo:rerun-if-changed=common/scanner.h");
+  for (directory, library) in [
+    ("src", "tree-sitter-sed"),
+    ("sed_ere/src", "tree-sitter-sed-ere"),
+  ] {
+    println!("cargo::rerun-if-changed={directory}");
+    let directory = Path::new(directory);
+    build
+      .clone()
+      .include(directory)
+      .files([directory.join("parser.c"), directory.join("scanner.c")])
+      .compile(library);
+  }
+  println!("cargo::rerun-if-changed=common/scanner.h");
 }