From 073ab245c7d3060669de42cab863845284305210 Mon Sep 17 00:00:00 2001 From: Ella Dunbar Date: Sat, 18 Oct 2025 16:58:19 -0500 Subject: [PATCH] Corrected all your language name references --- Cargo.toml | 8 ++-- Makefile | 2 +- Package.swift | 12 +++--- binding.gyp | 2 +- bindings/c/tree-sitter-YOUR_LANGUAGE_NAME.h | 16 ------- .../c/tree-sitter-YOUR_LANGUAGE_NAME.pc.in | 11 ----- bindings/go/binding.go | 4 +- bindings/go/binding_test.go | 8 ++-- bindings/node/binding.cc | 8 ++-- bindings/python/tests/test_binding.py | 6 +-- .../__init__.py | 42 ------------------- .../__init__.pyi | 10 ----- .../tree_sitter_your_language_name/binding.c | 27 ------------ .../tree_sitter_your_language_name/py.typed | 0 bindings/rust/build.rs | 2 +- bindings/rust/lib.rs | 10 ++--- .../YOUR_LANGUAGE_NAME.h | 16 ------- .../TreeSitterYourLanguageNameTests.swift | 12 ------ go.mod | 2 +- package.json | 2 +- pyproject.toml | 8 ++-- setup.py | 10 ++--- 22 files changed, 42 insertions(+), 176 deletions(-) delete mode 100644 bindings/c/tree-sitter-YOUR_LANGUAGE_NAME.h delete mode 100644 bindings/c/tree-sitter-YOUR_LANGUAGE_NAME.pc.in delete mode 100644 bindings/python/tree_sitter_your_language_name/__init__.py delete mode 100644 bindings/python/tree_sitter_your_language_name/__init__.pyi delete mode 100644 bindings/python/tree_sitter_your_language_name/binding.c delete mode 100644 bindings/python/tree_sitter_your_language_name/py.typed delete mode 100644 bindings/swift/TreeSitterYourLanguageName/YOUR_LANGUAGE_NAME.h delete mode 100644 bindings/swift/TreeSitterYourLanguageNameTests/TreeSitterYourLanguageNameTests.swift diff --git a/Cargo.toml b/Cargo.toml index 2fb493b..c4c88cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "tree-sitter-your-language-name" -description = "YourLanguageName grammar for tree-sitter" +name = "tree-sitter-zanscript" +description = "Zanscript grammar for tree-sitter" version = "0.0.1" license = "MIT" readme = "README.md" -keywords = ["incremental", "parsing", "tree-sitter", "your-language-name"] +keywords = ["incremental", "parsing", "tree-sitter", "zanscript"] categories = ["parsing", "text-editors"] -repository = "https://github.com/tree-sitter/tree-sitter-your-language-name" +repository = "https://github.com/tree-sitter/zanscript" edition = "2021" autoexamples = false diff --git a/Makefile b/Makefile index 0131a0b..aa7c211 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ endif VERSION := 0.0.1 -LANGUAGE_NAME := tree-sitter-YOUR_LANGUAGE_NAME +LANGUAGE_NAME := tree-sitter-zanscript # repository SRC_DIR := src diff --git a/Package.swift b/Package.swift index bc39be4..36234c3 100644 --- a/Package.swift +++ b/Package.swift @@ -2,16 +2,16 @@ import PackageDescription let package = Package( - name: "TreeSitterYourLanguageName", + name: "TreeSitterZanscript", products: [ - .library(name: "TreeSitterYourLanguageName", targets: ["TreeSitterYourLanguageName"]), + .library(name: "TreeSitterZanscript", targets: ["TreeSitterZanscript"]), ], dependencies: [ .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", from: "0.8.0"), ], targets: [ .target( - name: "TreeSitterYourLanguageName", + name: "TreeSitterZanscript", dependencies: [], path: ".", exclude: [ @@ -48,12 +48,12 @@ let package = Package( cSettings: [.headerSearchPath("src")] ), .testTarget( - name: "TreeSitterYourLanguageNameTests", + name: "TreeSitterZanscriptTests", dependencies: [ "SwiftTreeSitter", - "TreeSitterYourLanguageName", + "TreeSitterZanscript", ], - path: "bindings/swift/TreeSitterYourLanguageNameTests" + path: "bindings/swift/TreeSitterZanscriptTests" ) ], cLanguageStandard: .c11 diff --git a/binding.gyp b/binding.gyp index 6885550..fe8b3ed 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,7 +1,7 @@ { "targets": [ { - "target_name": "tree_sitter_YOUR_LANGUAGE_NAME_binding", + "target_name": "tree_sitter_zanscript_binding", "dependencies": [ "::New(env, tree_sitter_YOUR_LANGUAGE_NAME()); + exports["name"] = Napi::String::New(env, "zanscript"); + auto language = Napi::External::New(env, tree_sitter_zanscript()); language.TypeTag(&LANGUAGE_TYPE_TAG); exports["language"] = language; return exports; } -NODE_API_MODULE(tree_sitter_YOUR_LANGUAGE_NAME_binding, Init) +NODE_API_MODULE(tree_sitter_zanscript_binding, Init) diff --git a/bindings/python/tests/test_binding.py b/bindings/python/tests/test_binding.py index 2bd7d9e..b2bfb0e 100644 --- a/bindings/python/tests/test_binding.py +++ b/bindings/python/tests/test_binding.py @@ -1,11 +1,11 @@ from unittest import TestCase -import tree_sitter, tree_sitter_your_language_name +import tree_sitter, tree_sitter_zanscript class TestLanguage(TestCase): def test_can_load_grammar(self): try: - tree_sitter.Language(tree_sitter_your_language_name.language()) + tree_sitter.Language(tree_sitter_zanscript.language()) except Exception: - self.fail("Error loading YourLanguageName grammar") + self.fail("Error loading Zanscript grammar") diff --git a/bindings/python/tree_sitter_your_language_name/__init__.py b/bindings/python/tree_sitter_your_language_name/__init__.py deleted file mode 100644 index 4846468..0000000 --- a/bindings/python/tree_sitter_your_language_name/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -"""YourLanguageName grammar for tree-sitter""" - -from importlib.resources import files as _files - -from ._binding import language - - -def _get_query(name, file): - query = _files(f"{__package__}.queries") / file - globals()[name] = query.read_text() - return globals()[name] - - -def __getattr__(name): - # NOTE: uncomment these to include any queries that this grammar contains: - - # if name == "HIGHLIGHTS_QUERY": - # return _get_query("HIGHLIGHTS_QUERY", "highlights.scm") - # if name == "INJECTIONS_QUERY": - # return _get_query("INJECTIONS_QUERY", "injections.scm") - # if name == "LOCALS_QUERY": - # return _get_query("LOCALS_QUERY", "locals.scm") - # if name == "TAGS_QUERY": - # return _get_query("TAGS_QUERY", "tags.scm") - - raise AttributeError(f"module {__name__!r} has no attribute {name!r}") - - -__all__ = [ - "language", - # "HIGHLIGHTS_QUERY", - # "INJECTIONS_QUERY", - # "LOCALS_QUERY", - # "TAGS_QUERY", -] - - -def __dir__(): - return sorted(__all__ + [ - "__all__", "__builtins__", "__cached__", "__doc__", "__file__", - "__loader__", "__name__", "__package__", "__path__", "__spec__", - ]) diff --git a/bindings/python/tree_sitter_your_language_name/__init__.pyi b/bindings/python/tree_sitter_your_language_name/__init__.pyi deleted file mode 100644 index abf6633..0000000 --- a/bindings/python/tree_sitter_your_language_name/__init__.pyi +++ /dev/null @@ -1,10 +0,0 @@ -from typing import Final - -# NOTE: uncomment these to include any queries that this grammar contains: - -# HIGHLIGHTS_QUERY: Final[str] -# INJECTIONS_QUERY: Final[str] -# LOCALS_QUERY: Final[str] -# TAGS_QUERY: Final[str] - -def language() -> object: ... diff --git a/bindings/python/tree_sitter_your_language_name/binding.c b/bindings/python/tree_sitter_your_language_name/binding.c deleted file mode 100644 index c391f9c..0000000 --- a/bindings/python/tree_sitter_your_language_name/binding.c +++ /dev/null @@ -1,27 +0,0 @@ -#include - -typedef struct TSLanguage TSLanguage; - -TSLanguage *tree_sitter_your_language_name(void); - -static PyObject* _binding_language(PyObject *Py_UNUSED(self), PyObject *Py_UNUSED(args)) { - return PyCapsule_New(tree_sitter_your_language_name(), "tree_sitter.Language", NULL); -} - -static PyMethodDef methods[] = { - {"language", _binding_language, METH_NOARGS, - "Get the tree-sitter language for this grammar."}, - {NULL, NULL, 0, NULL} -}; - -static struct PyModuleDef module = { - .m_base = PyModuleDef_HEAD_INIT, - .m_name = "_binding", - .m_doc = NULL, - .m_size = -1, - .m_methods = methods -}; - -PyMODINIT_FUNC PyInit__binding(void) { - return PyModule_Create(&module); -} diff --git a/bindings/python/tree_sitter_your_language_name/py.typed b/bindings/python/tree_sitter_your_language_name/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs index 3c48191..da528f0 100644 --- a/bindings/rust/build.rs +++ b/bindings/rust/build.rs @@ -18,5 +18,5 @@ fn main() { println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap()); */ - c_config.compile("tree-sitter-YOUR_LANGUAGE_NAME"); + c_config.compile("tree-sitter-zanscript"); } diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs index 2e9e6df..c7c9fa8 100644 --- a/bindings/rust/lib.rs +++ b/bindings/rust/lib.rs @@ -7,10 +7,10 @@ //! let code = r#" //! "#; //! let mut parser = tree_sitter::Parser::new(); -//! let language = tree_sitter_YOUR_LANGUAGE_NAME::LANGUAGE; +//! let language = tree_sitter_zanscript::LANGUAGE; //! parser //! .set_language(&language.into()) -//! .expect("Error loading YourLanguageName parser"); +//! .expect("Error loading Zanscript parser"); //! let tree = parser.parse(code, None).unwrap(); //! assert!(!tree.root_node().has_error()); //! ``` @@ -23,11 +23,11 @@ use tree_sitter_language::LanguageFn; extern "C" { - fn tree_sitter_YOUR_LANGUAGE_NAME() -> *const (); + fn tree_sitter_zanscript() -> *const (); } /// The tree-sitter [`LanguageFn`] for this grammar. -pub const LANGUAGE: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_YOUR_LANGUAGE_NAME) }; +pub const LANGUAGE: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_zanscript) }; /// The content of the [`node-types.json`][] file for this grammar. /// @@ -48,6 +48,6 @@ mod tests { let mut parser = tree_sitter::Parser::new(); parser .set_language(&super::LANGUAGE.into()) - .expect("Error loading YourLanguageName parser"); + .expect("Error loading Zanscript parser"); } } diff --git a/bindings/swift/TreeSitterYourLanguageName/YOUR_LANGUAGE_NAME.h b/bindings/swift/TreeSitterYourLanguageName/YOUR_LANGUAGE_NAME.h deleted file mode 100644 index b79ab1c..0000000 --- a/bindings/swift/TreeSitterYourLanguageName/YOUR_LANGUAGE_NAME.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef TREE_SITTER_YOUR_LANGUAGE_NAME_H_ -#define TREE_SITTER_YOUR_LANGUAGE_NAME_H_ - -typedef struct TSLanguage TSLanguage; - -#ifdef __cplusplus -extern "C" { -#endif - -const TSLanguage *tree_sitter_YOUR_LANGUAGE_NAME(void); - -#ifdef __cplusplus -} -#endif - -#endif // TREE_SITTER_YOUR_LANGUAGE_NAME_H_ diff --git a/bindings/swift/TreeSitterYourLanguageNameTests/TreeSitterYourLanguageNameTests.swift b/bindings/swift/TreeSitterYourLanguageNameTests/TreeSitterYourLanguageNameTests.swift deleted file mode 100644 index 291bfcf..0000000 --- a/bindings/swift/TreeSitterYourLanguageNameTests/TreeSitterYourLanguageNameTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import XCTest -import SwiftTreeSitter -import TreeSitterYourLanguageName - -final class TreeSitterYourLanguageNameTests: XCTestCase { - func testCanLoadGrammar() throws { - let parser = Parser() - let language = Language(language: tree_sitter_your_language_name()) - XCTAssertNoThrow(try parser.setLanguage(language), - "Error loading YourLanguageName grammar") - } -} diff --git a/go.mod b/go.mod index bdead89..44b1854 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tree-sitter/tree-sitter-your_language_name +module github.com/tree-sitter/zanscript go 1.23 diff --git a/package.json b/package.json index 606db29..19ce759 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "file-types": [ "zs" ], - "injection-regex": "zanscript" + "injection-regex": "zanscript", "highlights": [ "queries/highlights.scm" ] diff --git a/pyproject.toml b/pyproject.toml index 3c86ecc..da39e59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,10 +3,10 @@ requires = ["setuptools>=42", "wheel"] build-backend = "setuptools.build_meta" [project] -name = "tree-sitter-your-language-name" -description = "YourLanguageName grammar for tree-sitter" +name = "tree-sitter-zanscript" +description = "Zanscript grammar for tree-sitter" version = "0.0.1" -keywords = ["incremental", "parsing", "tree-sitter", "your-language-name"] +keywords = ["incremental", "parsing", "tree-sitter", "zanscript"] classifiers = [ "Intended Audience :: Developers", "License :: OSI Approved :: MIT License", @@ -19,7 +19,7 @@ license.text = "MIT" readme = "README.md" [project.urls] -Homepage = "https://github.com/tree-sitter/tree-sitter-your-language-name" +Homepage = "https://github.com/tree-sitter/tree-sitter-zanscript" [project.optional-dependencies] core = ["tree-sitter~=0.22"] diff --git a/setup.py b/setup.py index 12335db..3d5b8d8 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ from wheel.bdist_wheel import bdist_wheel class Build(build): def run(self): if isdir("queries"): - dest = join(self.build_lib, "tree_sitter_YOUR_LANGUAGE_NAME", "queries") + dest = join(self.build_lib, "tree_sitter_zanscript", "queries") self.copy_tree("queries", dest) super().run() @@ -26,15 +26,15 @@ setup( packages=find_packages("bindings/python"), package_dir={"": "bindings/python"}, package_data={ - "tree_sitter_your_language_name": ["*.pyi", "py.typed"], - "tree_sitter_your_language_name.queries": ["*.scm"], + "tree_sitter_zanscript": ["*.pyi", "py.typed"], + "tree_sitter_zanscript.queries": ["*.scm"], }, - ext_package="tree_sitter_your_language_name", + ext_package="tree_sitter_zanscript", ext_modules=[ Extension( name="_binding", sources=[ - "bindings/python/tree_sitter_your_language_name/binding.c", + "bindings/python/tree_sitter_zanscript/binding.c", "src/parser.c", # NOTE: if your language uses an external scanner, add it here. ],