npm - tree-sitter-sh - Versions diffs - 0.3.0 → 0.4.0 - Mend

tree-sitter-sh 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/CMakeLists.txt +87 -0
package/Makefile +125 -0
package/bindings/c/tree-sitter-sh.pc.in +10 -0
package/bindings/c/tree_sitter/tree-sitter-sh.h +16 -0
package/grammar.js +17 -31
package/package.json +7 -3
package/src/grammar.json +6 -24
package/src/parser.c +1 -1
package/src/scanner.c +497 -502
package/test/binding.test.c +6 -0
package/tree-sitter.json +2 -2

package/CMakeLists.txt ADDED Viewed

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.13)
+project(tree-sitter-sh
+        VERSION "0.4.0"
+        DESCRIPTION "Tree-sitter grammar for POSIX sh."
+        HOMEPAGE_URL "https://github.com/konomanoasa/tree-sitter-sh"
+        LANGUAGES C)
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+option(TREE_SITTER_REUSE_ALLOCATOR "Reuse the library allocator" OFF)
+set(TREE_SITTER_ABI_VERSION 15 CACHE STRING "Tree-sitter ABI version")
+if(NOT ${TREE_SITTER_ABI_VERSION} MATCHES "^[0-9]+$")
+    unset(TREE_SITTER_ABI_VERSION CACHE)
+    message(FATAL_ERROR "TREE_SITTER_ABI_VERSION must be an integer")
+endif()
+include(GNUInstallDirs)
+if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  include(CTest)
+endif()
+find_program(TREE_SITTER_CLI tree-sitter DOC "Tree-sitter CLI")
+add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/grammar.json"
+                          "${CMAKE_CURRENT_SOURCE_DIR}/src/node-types.json"
+                   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/grammar.js"
+                   COMMAND "${TREE_SITTER_CLI}" generate grammar.js --no-parser
+                   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                   COMMENT "Generating grammar.json")
+add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/parser.c"
+                   BYPRODUCTS "${CMAKE_CURRENT_SOURCE_DIR}/src/tree_sitter/parser.h"
+                              "${CMAKE_CURRENT_SOURCE_DIR}/src/tree_sitter/alloc.h"
+                              "${CMAKE_CURRENT_SOURCE_DIR}/src/tree_sitter/array.h"
+                   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/grammar.json"
+                   COMMAND "${TREE_SITTER_CLI}" generate src/grammar.json
+                            --abi=${TREE_SITTER_ABI_VERSION}
+                   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                   COMMENT "Generating parser.c")
+add_library(tree-sitter-sh src/parser.c)
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/scanner.c)
+  target_sources(tree-sitter-sh PRIVATE src/scanner.c)
+endif()
+target_include_directories(tree-sitter-sh
+                           PRIVATE src
+                           INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/bindings/c>
+                                     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+target_compile_definitions(tree-sitter-sh PRIVATE
+                           $<$<BOOL:${TREE_SITTER_REUSE_ALLOCATOR}>:TREE_SITTER_REUSE_ALLOCATOR>
+                           $<$<CONFIG:Debug>:TREE_SITTER_DEBUG>)
+set_target_properties(tree-sitter-sh
+                      PROPERTIES
+                      C_STANDARD 11
+                      POSITION_INDEPENDENT_CODE ON
+                      SOVERSION "${TREE_SITTER_ABI_VERSION}.${PROJECT_VERSION_MAJOR}"
+                      DEFINE_SYMBOL "")
+if(BUILD_TESTING AND CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  add_executable(tree-sitter-sh-binding-test test/binding.test.c)
+  target_link_libraries(tree-sitter-sh-binding-test PRIVATE tree-sitter-sh)
+  add_test(NAME tree-sitter-sh-binding COMMAND tree-sitter-sh-binding-test)
+endif()
+configure_file(bindings/c/tree-sitter-sh.pc.in
+               "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter-sh.pc" @ONLY)
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bindings/c/tree_sitter"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+        FILES_MATCHING PATTERN "*.h")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter-sh.pc"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+install(TARGETS tree-sitter-sh
+        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+file(GLOB QUERIES queries/*.scm)
+install(FILES ${QUERIES}
+        DESTINATION "${CMAKE_INSTALL_DATADIR}/tree-sitter/queries/sh")
+add_custom_target(ts-test "${TREE_SITTER_CLI}" test
+                  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                  COMMENT "tree-sitter test")

package/Makefile ADDED Viewed

@@ -0,0 +1,125 @@
+LANGUAGE_NAME := tree-sitter-sh
+HOMEPAGE_URL := https://github.com/konomanoasa/tree-sitter-sh
+VERSION := 0.4.0
+DESCRIPTION := Tree-sitter grammar for POSIX sh.
+# repository
+SRC_DIR := src
+TS ?= tree-sitter
+# install directory layout
+PREFIX ?= /usr/local
+DATADIR ?= $(PREFIX)/share
+INCLUDEDIR ?= $(PREFIX)/include
+LIBDIR ?= $(PREFIX)/lib
+BINDIR ?= $(PREFIX)/bin
+PCLIBDIR ?= $(LIBDIR)/pkgconfig
+# source/object files
+PARSER := $(SRC_DIR)/parser.c
+EXTRAS := $(filter-out $(PARSER),$(wildcard $(SRC_DIR)/*.c))
+OBJS := $(patsubst %.c,%.o,$(PARSER) $(EXTRAS))
+MAKE_BUILD_DIR := build/make
+TEST := $(MAKE_BUILD_DIR)/binding.test
+# flags
+ARFLAGS ?= rcs
+override CFLAGS += -I$(SRC_DIR) -std=c11 -fPIC
+# ABI versioning
+SONAME_MAJOR = $(shell sed -n 's/\#define LANGUAGE_VERSION //p' $(PARSER))
+SONAME_MINOR = $(word 1,$(subst ., ,$(VERSION)))
+# OS-specific bits
+MACHINE := $(shell $(CC) -dumpmachine)
+ifneq ($(findstring darwin,$(MACHINE)),)
+	SOEXT = dylib
+	SOEXTVER_MAJOR = $(SONAME_MAJOR).$(SOEXT)
+	SOEXTVER = $(SONAME_MAJOR).$(SONAME_MINOR).$(SOEXT)
+	LINKSHARED = -dynamiclib -Wl,-install_name,$(LIBDIR)/lib$(LANGUAGE_NAME).$(SOEXTVER),-rpath,@executable_path/../Frameworks
+else ifneq ($(findstring mingw32,$(MACHINE)),)
+	SOEXT = dll
+	LINKSHARED += -s -shared -Wl,--out-implib,lib$(LANGUAGE_NAME).dll.a
+	TEST := $(MAKE_BUILD_DIR)/binding.test.exe
+else
+	SOEXT = so
+	SOEXTVER_MAJOR = $(SOEXT).$(SONAME_MAJOR)
+	SOEXTVER = $(SOEXT).$(SONAME_MAJOR).$(SONAME_MINOR)
+	LINKSHARED = -shared -Wl,-soname,lib$(LANGUAGE_NAME).$(SOEXTVER)
+ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
+	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
+endif
+endif
+all: lib$(LANGUAGE_NAME).a lib$(LANGUAGE_NAME).$(SOEXT) $(LANGUAGE_NAME).pc
+lib$(LANGUAGE_NAME).a: $(OBJS)
+	$(AR) $(ARFLAGS) $@ $^
+lib$(LANGUAGE_NAME).$(SOEXT): $(OBJS)
+	$(CC) $(LDFLAGS) $(LINKSHARED) $^ $(LDLIBS) -o $@
+ifneq ($(STRIP),)
+	$(STRIP) $@
+endif
+ifneq ($(findstring mingw32,$(MACHINE)),)
+lib$(LANGUAGE_NAME).dll.a: lib$(LANGUAGE_NAME).$(SOEXT)
+endif
+$(LANGUAGE_NAME).pc: bindings/c/$(LANGUAGE_NAME).pc.in
+	sed -e 's|@PROJECT_VERSION@|$(VERSION)|' \
+		-e 's|@CMAKE_INSTALL_LIBDIR@|$(LIBDIR:$(PREFIX)/%=%)|' \
+		-e 's|@CMAKE_INSTALL_INCLUDEDIR@|$(INCLUDEDIR:$(PREFIX)/%=%)|' \
+		-e 's|@PROJECT_DESCRIPTION@|$(DESCRIPTION)|' \
+		-e 's|@PROJECT_HOMEPAGE_URL@|$(HOMEPAGE_URL)|' \
+		-e 's|@CMAKE_INSTALL_PREFIX@|$(PREFIX)|' $< > $@
+$(SRC_DIR)/grammar.json: grammar.js
+	$(TS) generate --no-parser $^
+$(PARSER): $(SRC_DIR)/grammar.json
+	$(TS) generate $^
+$(MAKE_BUILD_DIR):
+	mkdir -p $@
+$(TEST): test/binding.test.c lib$(LANGUAGE_NAME).a | $(MAKE_BUILD_DIR)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -Ibindings/c $< lib$(LANGUAGE_NAME).a $(LDFLAGS) $(LDLIBS) -o $@
+install: all
+	install -d '$(DESTDIR)$(DATADIR)'/tree-sitter/queries/sh '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter '$(DESTDIR)$(PCLIBDIR)' '$(DESTDIR)$(LIBDIR)'
+	install -m644 bindings/c/tree_sitter/$(LANGUAGE_NAME).h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/$(LANGUAGE_NAME).h
+	install -m644 $(LANGUAGE_NAME).pc '$(DESTDIR)$(PCLIBDIR)'/$(LANGUAGE_NAME).pc
+	install -m644 lib$(LANGUAGE_NAME).a '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).a
+ifneq ($(findstring mingw32,$(MACHINE)),)
+	install -d '$(DESTDIR)$(BINDIR)'
+	install -m755 lib$(LANGUAGE_NAME).dll '$(DESTDIR)$(BINDIR)'/lib$(LANGUAGE_NAME).dll
+	install -m755 lib$(LANGUAGE_NAME).dll.a '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).dll.a
+else
+	install -m755 lib$(LANGUAGE_NAME).$(SOEXT) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER)
+	cd '$(DESTDIR)$(LIBDIR)' && ln -sf lib$(LANGUAGE_NAME).$(SOEXTVER) lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR)
+	cd '$(DESTDIR)$(LIBDIR)' && ln -sf lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR) lib$(LANGUAGE_NAME).$(SOEXT)
+endif
+ifneq ($(wildcard queries/*.scm),)
+	install -m644 queries/*.scm '$(DESTDIR)$(DATADIR)'/tree-sitter/queries/sh
+endif
+uninstall:
+	$(RM) '$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).a \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER) \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXTVER_MAJOR) \
+		'$(DESTDIR)$(LIBDIR)'/lib$(LANGUAGE_NAME).$(SOEXT) \
+		'$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/$(LANGUAGE_NAME).h \
+		'$(DESTDIR)$(PCLIBDIR)'/$(LANGUAGE_NAME).pc
+	$(RM) -r '$(DESTDIR)$(DATADIR)'/tree-sitter/queries/sh
+clean:
+	$(RM) $(OBJS) $(LANGUAGE_NAME).pc lib$(LANGUAGE_NAME).a lib$(LANGUAGE_NAME).$(SOEXT) lib$(LANGUAGE_NAME).dll.a
+	$(RM) -r $(MAKE_BUILD_DIR)
+test: $(TEST)
+	./$(TEST)
+.PHONY: all install uninstall clean test

package/bindings/c/tree-sitter-sh.pc.in ADDED Viewed

@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+Name: tree-sitter-sh
+Description: @PROJECT_DESCRIPTION@
+URL: @PROJECT_HOMEPAGE_URL@
+Version: @PROJECT_VERSION@
+Libs: -L${libdir} -ltree-sitter-sh
+Cflags: -I${includedir}

package/bindings/c/tree_sitter/tree-sitter-sh.h ADDED Viewed

@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_SH_H_
+#define TREE_SITTER_SH_H_
+typedef struct TSLanguage TSLanguage;
+#ifdef __cplusplus
+extern "C" {
+#endif
+const TSLanguage *tree_sitter_sh(void);
+#ifdef __cplusplus
+}
+#endif
+#endif // TREE_SITTER_SH_H_

package/grammar.js CHANGED Viewed

@@ -95,27 +95,24 @@ const wordPatternSpecialSources = ($) => [
   $.pattern_equivalence_class_source,
 ];
+const parameterPatternCollatingSymbolSource = ($) =>
+  alias(
+    $._parameter_pattern_collating_symbol_source,
+    $.pattern_collating_symbol_source,
+  );
 const parameterPatternSpecialSources = ($) => [
   alias(
     $._parameter_pattern_character_class_source,
     $.pattern_character_class_source,
   ),
-  alias(
-    $._parameter_pattern_collating_symbol_source,
-    $.pattern_collating_symbol_source,
-  ),
+  parameterPatternCollatingSymbolSource($),
   alias(
     $._parameter_pattern_equivalence_class_source,
     $.pattern_equivalence_class_source,
   ),
 ];
-const parameterPatternCollatingSymbolSource = ($) =>
-  alias(
-    $._parameter_pattern_collating_symbol_source,
-    $.pattern_collating_symbol_source,
-  );
 const patternSpecialContentCharacters = ($, plain) => [
   plain,
   $._pattern_special_marker_character,
@@ -257,12 +254,6 @@ const lineContinuationRun = ($) => prec.right(1, repeat1($.line_continuation));
 const parameterBraceClose = ($) => choice("}", $._here_document_boundary);
-const postOperatorLayout = ($) =>
-  choice(
-    seq($.linebreak, optional($._horizontal_layout)),
-    optional($._horizontal_layout),
-  );
 const arithmeticBinaryExpression = ($, left, right, operatorSegment) =>
   prec.left(
     seq(
@@ -707,6 +698,12 @@ const parameterOperatorTail = ($, word, wordTrailingContinuations) =>
 const parameterExpansionTail = ($, operatorTail) =>
   choice(parameterBraceClose($), operatorTail);
+const parameterPatternSource = ($) =>
+  choice(
+    $._parameter_tilde_source,
+    seq($._parameter_pattern_part, optional($._parameter_source_tail)),
+  );
 const caseClauseItems = ($) =>
   choice(
     $.esac_keyword,
@@ -1237,7 +1234,7 @@ module.exports = grammar({
             $._and_or_continuation,
             optional($._horizontal_layout),
             field("operator", choice($.and_if, $.or_if)),
-            postOperatorLayout($),
+            linebreakLayout($),
             field("pipeline", $.pipeline),
           ),
         ),
@@ -1259,7 +1256,7 @@ module.exports = grammar({
             $._pipe_continuation,
             optional($._horizontal_layout),
             "|",
-            postOperatorLayout($),
+            linebreakLayout($),
             field("command", $.command),
           ),
         ),
@@ -2406,11 +2403,7 @@ module.exports = grammar({
     parameter_pattern_operator: (_) => prec(2, choice("%%", "##", "%", "#")),
-    parameter_word: ($) =>
-      choice(
-        $._parameter_tilde_source,
-        seq($._parameter_pattern_part, optional($._parameter_source_tail)),
-      ),
+    parameter_word: ($) => parameterPatternSource($),
     _double_quoted_parameter_word: ($) =>
       seq(
@@ -2435,14 +2428,7 @@ module.exports = grammar({
     _double_quoted_parameter_word_part: ($) =>
       choice($._double_quoted_parameter_word_lead_part, $.line_continuation),
-    parameter_pattern: ($) =>
-      prec.right(
-        1,
-        choice(
-          $._parameter_tilde_source,
-          seq($._parameter_pattern_part, optional($._parameter_source_tail)),
-        ),
-      ),
+    parameter_pattern: ($) => prec.right(1, parameterPatternSource($)),
     _parameter_source_tail: ($) => repeat1($._parameter_pattern_part),

package/package.json CHANGED Viewed

@@ -1,20 +1,24 @@
 {
   "name": "tree-sitter-sh",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Tree-sitter grammar for POSIX sh.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-sh.git",
   "files": [
+    "bindings/c",
+    "CMakeLists.txt",
     "grammar.js",
+    "Makefile",
     "queries/*.scm",
     "src/*.c",
     "src/*.json",
     "src/tree_sitter/*.h",
+    "test/binding.test.c",
     "tree-sitter.json"
   ],
   "scripts": {
-    "check": "biome check . && node scripts/check-scanner.js && node scripts/check-generated.js && npm test",
-    "format": "biome check --write . && node scripts/check-scanner.js --write",
+    "check": "biome check . && node scripts/check-c.js && node scripts/check-generated.js && npm test",
+    "format": "biome check --write . && node scripts/check-c.js --write",
     "generate": "npm run tree-sitter -- generate",
     "test": "npm run tree-sitter -- test --rebuild && node --test",
     "test:fuzz": "npm run tree-sitter -- fuzz --rebuild --iterations 100 --edits 5",

package/src/grammar.json CHANGED Viewed

@@ -401,26 +401,17 @@
                 }
               },
               {
-                "type": "CHOICE",
+                "type": "SEQ",
                 "members": [
                   {
-                    "type": "SEQ",
+                    "type": "CHOICE",
                     "members": [
                       {
                         "type": "SYMBOL",
                         "name": "linebreak"
                       },
                       {
-                        "type": "CHOICE",
-                        "members": [
-                          {
-                            "type": "SYMBOL",
-                            "name": "_horizontal_layout"
-                          },
-                          {
-                            "type": "BLANK"
-                          }
-                        ]
+                        "type": "BLANK"
                       }
                     ]
                   },
@@ -534,26 +525,17 @@
                 "value": "|"
               },
               {
-                "type": "CHOICE",
+                "type": "SEQ",
                 "members": [
                   {
-                    "type": "SEQ",
+                    "type": "CHOICE",
                     "members": [
                       {
                         "type": "SYMBOL",
                         "name": "linebreak"
                       },
                       {
-                        "type": "CHOICE",
-                        "members": [
-                          {
-                            "type": "SYMBOL",
-                            "name": "_horizontal_layout"
-                          },
-                          {
-                            "type": "BLANK"
-                          }
-                        ]
+                        "type": "BLANK"
                       }
                     ]
                   },

package/src/parser.c CHANGED Viewed

@@ -932412,7 +932412,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_sh(void) {
     .max_reserved_word_set_size = 0,
     .metadata = {
       .major_version = 0,
-      .minor_version = 3,
+      .minor_version = 4,
       .patch_version = 0,
     },
   };