[PATCH 0/3] Add tree-sitter-verilog/-vhdl/-erlang

Done

Details

3 participants

Karl Hallsby
Liliana Marie Prikler
Zheng Junjie

Owner: unassigned

Submitted by: Karl Hallsby

Severity: normal

Karl Hallsby wrote on 2 May 17:36 +0200

Recipients:(address . guix-patches@gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:cover.1714663253.git.karl@hallsby.com

Verilog & VHDL have Emacs major modes for them. I have tested that both

verilog-ts-mode and vhdl-ts-mode produce syntax highlighting.

Erlang does not have a tree-sitter-powered major-mode for Emacs yet.

Karl Hallsby (3):

gnu: Add tree-sitter-verilog.

gnu: Add tree-sitter-vhdl.

gnu: Add tree-sitter-erlang.

gnu/packages/tree-sitter.scm | 58 ++++++++++++++++++++++++++++++++++++

1 file changed, 58 insertions(+)

base-commit: 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3

2.41.0

Karl Hallsby wrote on 2 May 17:39 +0200

[PATCH 2/3] gnu: Add tree-sitter-vhdl.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:1cc45cfd22fb89cc16ef6d9bdb26f5b0d53afbf7.1714663253.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-vhdl): New variable.

This is the tree-sitter-vhdl implementation the tree-sitter website points to,

but it seems that tree-sitter-vhdl seems to be abandoned (though it may be

complete). The cleanup snippet does more work than it should probably do, but

it is the only way for

Change-Id: Ia26e33f9898573e70c9afdd4025e3770d042dbd6

---

gnu/packages/tree-sitter.scm | 31 +++++++++++++++++++++++++++++++

1 file changed, 31 insertions(+)

Toggle diff (39 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 105581bfc4..42f311223e 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -716,3 +716,34 @@ (define-public tree-sitter-verilog
            (use-modules (guix build utils))
            (delete-file "binding.gyp")
            (delete-file-recursively "bindings"))))))
+
+(define-public tree-sitter-vhdl
+  (let ((commit "a3b2d84990527c7f8f4ae219c332c00c33d2d8e5")
+        (revision "0"))
+    (tree-sitter-grammar
+     "vhdl" "VHDL"
+     "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a"
+     (git-version "0.0.0" revision commit)
+     #:repository-url "https://github.com/alemuller/tree-sitter-vhdl"
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           ;; tree-sitter-vhdl does not have bindings/ directory.
+           (delete-file "src/grammar.json")
+           (delete-file "src/node-types.json")
+           (delete-file "src/parser.c")
+           (delete-file-recursively "src/tree_sitter")
+           ;; Fix a query error in the highlight.scm query test. This would be
+           ;; easier with a patch, but this works too, and we still get to use
+           ;; tree-sitter-grammar. The fix is taken from here:
+           ;; https://github.com/n8tlarsen/tree-sitter-vhdl/commit/dabf157c6bb7220d72d3ceba0ce1abd90bf62187
+           ;; This is a documented issue that has not been resolved for nearly 2
+           ;; years.
+           ;; https://github.com/alemuller/tree-sitter-vhdl/issues/2
+           (substitute* "queries/highlights.scm"
+             (("\\(integer_decimal\n") "(integer_decimal)\n")
+             (("\\(integer\\)") "")
+             (("\"0\")") "\"0\"")))))))

2.41.0

Karl Hallsby wrote on 2 May 17:39 +0200

[PATCH 1/3] gnu: Add tree-sitter-verilog.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:6b59b090953857ab8cc9cbb48c9b89f43da5d047.1714663253.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-verilog): New variable.

Change-Id: I2066aff3cf39cebda956125cdac71236502a7ac5

---

gnu/packages/tree-sitter.scm | 15 +++++++++++++++

1 file changed, 15 insertions(+)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ee0acb82de..105581bfc4 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -701,3 +701,18 @@ (define-public tree-sitter-tlaplus
    "1.0.8"
    ;; Version 1.2.1 is most recent, but requires tree-sitter >0.21.0
    #:repository-url "https://github.com/tlaplus-community/tree-sitter-tlaplus"))
+
+(define-public tree-sitter-verilog
+  (let ((commit "902031343056bc0b11f3e47b33f036a9cf59f58d")
+        (revision "0"))
+    (tree-sitter-grammar
+     "verilog" "Verilog"
+     "1mrgdi0aj2bm4f2jdz93r1c3m1hiymjfhd2pc14xlz6waxpd48zg"
+     (git-version "0.0" revision commit)
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           (delete-file-recursively "bindings"))))))
-- 
2.41.0

Karl Hallsby wrote on 2 May 17:39 +0200

[PATCH 3/3] gnu: Add tree-sitter-erlang.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:0bb4610d60628a4cd7d4537fb3073be2c2222982.1714663253.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-erlang): New variable.

Change-Id: Ib1449549249816736bf30a1d419a23fd7a45570e

---

gnu/packages/tree-sitter.scm | 12 ++++++++++++

1 file changed, 12 insertions(+)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 42f311223e..dfe79496f9 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -426,6 +426,18 @@ (define-public tree-sitter-dockerfile
    "0.1.2"
    #:repository-url "https://github.com/camdencheek/tree-sitter-dockerfile"))
 
+(define-public tree-sitter-erlang
+  ;; This is an untagged release, for 0.4.0
+  ;; Newer versions use tree-sitter 0.22.1
+  (let ((commit "57e69513efd831f9cc8207d65d96bad917ca4aa4")
+        (revision "0"))
+  (tree-sitter-grammar
+   "erlang" "Erlang"
+   "1h0c9qc6i0kz5a0yq68xp623f84g4mc8hcp00khdbf7y7z7b9izc"
+   (git-version "0.0.0" revision commit)
+   #:repository-url "https://github.com/WhatsApp/tree-sitter-erlang"
+   #:commit commit)))
+
 (define-public tree-sitter-elm
   (tree-sitter-grammar
    "elm" "Elm"
-- 
2.41.0

Zheng Junjie wrote on 10 May 14:14 +0200

Re: [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl.

Recipients:(name . Karl Hallsby via Guix-patches via)(address . guix-patches@gnu.org)

Message-ID:87seypc19b.fsf@iscas.ac.cn

Karl Hallsby via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (30 lines)> * gnu/packages/tree-sitter.scm (tree-sitter-vhdl): New variable.
>
> This is the tree-sitter-vhdl implementation the tree-sitter website points to,
> but it seems that tree-sitter-vhdl seems to be abandoned (though it may be
> complete).  The cleanup snippet does more work than it should probably do, but
> it is the only way for
>
>
> Change-Id: Ia26e33f9898573e70c9afdd4025e3770d042dbd6
> ---
>  gnu/packages/tree-sitter.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 105581bfc4..42f311223e 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -716,3 +716,34 @@ (define-public tree-sitter-verilog
>             (use-modules (guix build utils))
>             (delete-file "binding.gyp")
>             (delete-file-recursively "bindings"))))))
> +
> +(define-public tree-sitter-vhdl
> +  (let ((commit "a3b2d84990527c7f8f4ae219c332c00c33d2d8e5")
> +        (revision "0"))
> +    (tree-sitter-grammar
> +     "vhdl" "VHDL"
> +     "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a"
> +     (git-version "0.0.0" revision commit)

i think version should 0.1.1, not 0.0.0

see https://github.com/alemuller/tree-sitter-vhdl/blob/main/package.json

Toggle quote (23 lines)> +     #:repository-url "https://github.com/alemuller/tree-sitter-vhdl"
> +     #:commit commit
> +     #:get-cleanup-snippet
> +     (lambda _
> +       #~(begin
> +           (use-modules (guix build utils))
> +           (delete-file "binding.gyp")
> +           ;; tree-sitter-vhdl does not have bindings/ directory.
> +           (delete-file "src/grammar.json")
> +           (delete-file "src/node-types.json")
> +           (delete-file "src/parser.c")
> +           (delete-file-recursively "src/tree_sitter")
> +           ;; Fix a query error in the highlight.scm query test. This would be
> +           ;; easier with a patch, but this works too, and we still get to use
> +           ;; tree-sitter-grammar. The fix is taken from here:
> +           ;; https://github.com/n8tlarsen/tree-sitter-vhdl/commit/dabf157c6bb7220d72d3ceba0ce1abd90bf62187
> +           ;; This is a documented issue that has not been resolved for nearly 2
> +           ;; years.
> +           ;; https://github.com/alemuller/tree-sitter-vhdl/issues/2
> +           (substitute* "queries/highlights.scm"
> +             (("\\(integer_decimal\n") "(integer_decimal)\n")
> +             (("\\(integer\\)") "")
> +             (("\"0\")") "\"0\"")))))))

Zheng Junjie wrote on 10 May 14:16 +0200

Re: [bug#70720] [PATCH 1/3] gnu: Add tree-sitter-verilog.

Recipients:(name . Karl Hallsby via Guix-patches via)(address . guix-patches@gnu.org)

Message-ID:87o79dc153.fsf@iscas.ac.cn

Karl Hallsby via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (24 lines)> * gnu/packages/tree-sitter.scm (tree-sitter-verilog): New variable.
>
> Change-Id: I2066aff3cf39cebda956125cdac71236502a7ac5
> ---
>  gnu/packages/tree-sitter.scm | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index ee0acb82de..105581bfc4 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -701,3 +701,18 @@ (define-public tree-sitter-tlaplus
>     "1.0.8"
>     ;; Version 1.2.1 is most recent, but requires tree-sitter >0.21.0
>     #:repository-url "https://github.com/tlaplus-community/tree-sitter-tlaplus"))
> +
> +(define-public tree-sitter-verilog
> +  (let ((commit "902031343056bc0b11f3e47b33f036a9cf59f58d")
> +        (revision "0"))
> +    (tree-sitter-grammar
> +     "verilog" "Verilog"
> +     "1mrgdi0aj2bm4f2jdz93r1c3m1hiymjfhd2pc14xlz6waxpd48zg"
> +     (git-version "0.0" revision commit)

should 1.0.0, see

https://github.com/tree-sitter/tree-sitter-verilog/blob/902031343056bc0b11f3e47b33f036a9cf59f58d/package.json

Toggle quote (7 lines)> +     #:commit commit
> +     #:get-cleanup-snippet
> +     (lambda _
> +       #~(begin
> +           (use-modules (guix build utils))
> +           (delete-file "binding.gyp")
> +           (delete-file-recursively "bindings"))))))

Zheng Junjie wrote on 10 May 14:18 +0200

Re: [bug#70720] [PATCH 3/3] gnu: Add tree-sitter-erlang.

Recipients:(name . Karl Hallsby via Guix-patches via)(address . guix-patches@gnu.org)

Message-ID:87jzk1c12f.fsf@iscas.ac.cn

Karl Hallsby via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (25 lines)> * gnu/packages/tree-sitter.scm (tree-sitter-erlang): New variable.
>
> Change-Id: Ib1449549249816736bf30a1d419a23fd7a45570e
> ---
>  gnu/packages/tree-sitter.scm | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
> index 42f311223e..dfe79496f9 100644
> --- a/gnu/packages/tree-sitter.scm
> +++ b/gnu/packages/tree-sitter.scm
> @@ -426,6 +426,18 @@ (define-public tree-sitter-dockerfile
>     "0.1.2"
>     #:repository-url "https://github.com/camdencheek/tree-sitter-dockerfile"))
>  
> +(define-public tree-sitter-erlang
> +  ;; This is an untagged release, for 0.4.0
> +  ;; Newer versions use tree-sitter 0.22.1
> +  (let ((commit "57e69513efd831f9cc8207d65d96bad917ca4aa4")
> +        (revision "0"))
> +  (tree-sitter-grammar
> +   "erlang" "Erlang"
> +   "1h0c9qc6i0kz5a0yq68xp623f84g4mc8hcp00khdbf7y7z7b9izc"
> +   (git-version "0.0.0" revision commit)

should "0.4.0"

Toggle quote (6 lines)> +   #:repository-url "https://github.com/WhatsApp/tree-sitter-erlang"
> +   #:commit commit)))
> +
>  (define-public tree-sitter-elm
>    (tree-sitter-grammar
>     "elm" "Elm"

Karl Hallsby wrote on 10 May 18:26 +0200

[PATCH 1/3] gnu: Add tree-sitter-verilog.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:2abdc3ee62e1fcef646a25ecde7a3a9b86230b32.1715358353.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-verilog): New variable.

Change-Id: I2066aff3cf39cebda956125cdac71236502a7ac5

Change-Id: If4acb8c10cd3942f46dcb05b8009760a6452b67a

---

gnu/packages/tree-sitter.scm | 16 ++++++++++++++++

1 file changed, 16 insertions(+)

Toggle diff (28 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ee0acb82de..206fd7268e 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -701,3 +701,19 @@ (define-public tree-sitter-tlaplus
    "1.0.8"
    ;; Version 1.2.1 is most recent, but requires tree-sitter >0.21.0
    #:repository-url "https://github.com/tlaplus-community/tree-sitter-tlaplus"))
+
+(define-public tree-sitter-verilog
+  (let ((version "1.0.0") ; In package.json, but untagged
+        (commit "075ebfc84543675f12e79a955f79d717772dcef3")
+        (revision "0"))
+    (tree-sitter-grammar
+     "verilog" "Verilog"
+     "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k"
+     (git-version version revision commit)
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           (delete-file-recursively "bindings"))))))

base-commit: 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3
-- 
2.41.0

Karl Hallsby wrote on 10 May 18:26 +0200

[PATCH 2/3] gnu: Add tree-sitter-vhdl.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:465b905153d08c5c831327955829ad4a68cf94e8.1715358353.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-vhdl): New variable.

Change-Id: Ia26e33f9898573e70c9afdd4025e3770d042dbd6

Change-Id: I07b2b89f878957af1544344122cdfe8970efc9f7

---

gnu/packages/tree-sitter.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 206fd7268e..3863558883 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -717,3 +717,35 @@ (define-public tree-sitter-verilog
            (use-modules (guix build utils))
            (delete-file "binding.gyp")
            (delete-file-recursively "bindings"))))))
+
+(define-public tree-sitter-vhdl
+  (let ((version "0.1.1") ; In package.json, but untagged
+        (commit "a3b2d84990527c7f8f4ae219c332c00c33d2d8e5")
+        (revision "0"))
+    (tree-sitter-grammar
+     "vhdl" "VHDL"
+     "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a"
+     (git-version version revision commit)
+     #:repository-url "https://github.com/alemuller/tree-sitter-vhdl"
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           ;; tree-sitter-vhdl does not have bindings/ directory.
+           (delete-file "src/grammar.json")
+           (delete-file "src/node-types.json")
+           (delete-file "src/parser.c")
+           (delete-file-recursively "src/tree_sitter")
+           ;; Fix a query error in the highlight.scm query test. This would be
+           ;; easier with a patch, but this works too, and we still get to use
+           ;; tree-sitter-grammar. The fix is taken from here:
+           ;; https://github.com/n8tlarsen/tree-sitter-vhdl/commit/dabf157c6bb7220d72d3ceba0ce1abd90bf62187
+           ;; This is a documented issue that has not been resolved for nearly 2
+           ;; years.
+           ;; https://github.com/alemuller/tree-sitter-vhdl/issues/2
+           (substitute* "queries/highlights.scm"
+             (("\\(integer_decimal\n") "(integer_decimal)\n")
+             (("\\(integer\\)") "")
+             (("\"0\")") "\"0\"")))))))
-- 
2.41.0

Karl Hallsby wrote on 10 May 18:26 +0200

[PATCH 3/3] gnu: Add tree-sitter-erlang.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:d59f63b78b3dd5e3e9a275a8a404f0cf76a574fb.1715358353.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-erlang): New variable.

Change-Id: Ib1449549249816736bf30a1d419a23fd7a45570e

Change-Id: I99cdde6418e04d4898f0f6509d2e7d849e2a4f22

---

gnu/packages/tree-sitter.scm | 12 ++++++++++++

1 file changed, 12 insertions(+)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3863558883..c6e84bc85b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -426,6 +426,18 @@ (define-public tree-sitter-dockerfile
    "0.1.2"
    #:repository-url "https://github.com/camdencheek/tree-sitter-dockerfile"))
 
+(define-public tree-sitter-erlang
+  ;; Versions newer than 0.4.0 use tree-sitter 0.22.1
+  (let ((version "0.4.0") ; In Cargo.toml, but untagged
+        (commit "57e69513efd831f9cc8207d65d96bad917ca4aa4")
+        (revision "0"))
+  (tree-sitter-grammar
+   "erlang" "Erlang"
+   "1h0c9qc6i0kz5a0yq68xp623f84g4mc8hcp00khdbf7y7z7b9izc"
+   (git-version version revision commit)
+   #:repository-url "https://github.com/WhatsApp/tree-sitter-erlang"
+   #:commit commit)))
+
 (define-public tree-sitter-elm
   (tree-sitter-grammar
    "elm" "Elm"
-- 
2.41.0

Liliana Marie Prikler wrote on 10 May 18:49 +0200

Re: [bug#70720] [PATCH 1/3] gnu: Add tree-sitter-verilog.

Recipients:

Message-ID:584435173232aca1c04afd1c84bdd11479feb4e5.camel@gmail.com

Am Freitag, dem 10.05.2024 um 11:26 -0500 schrieb Karl Hallsby:

Toggle quote (6 lines)> * gnu/packages/tree-sitter.scm (tree-sitter-verilog): New variable.
> 
> Change-Id: I2066aff3cf39cebda956125cdac71236502a7ac5
> 
> Change-Id: If4acb8c10cd3942f46dcb05b8009760a6452b67a
> ---

Don't do multiple Change-Ids.

Cheers

Karl Hallsby wrote on 10 May 20:28 +0200

[PATCH 1/3] gnu: Add tree-sitter-verilog.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:14707a5b3202ef9d30cbba4a20c85c12a1547ed0.1715365716.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-verilog): New variable.

Change-Id: If4acb8c10cd3942f46dcb05b8009760a6452b67a

---

gnu/packages/tree-sitter.scm | 16 ++++++++++++++++

1 file changed, 16 insertions(+)

Toggle diff (28 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index ee0acb82de..206fd7268e 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -701,3 +701,19 @@ (define-public tree-sitter-tlaplus
    "1.0.8"
    ;; Version 1.2.1 is most recent, but requires tree-sitter >0.21.0
    #:repository-url "https://github.com/tlaplus-community/tree-sitter-tlaplus"))
+
+(define-public tree-sitter-verilog
+  (let ((version "1.0.0") ; In package.json, but untagged
+        (commit "075ebfc84543675f12e79a955f79d717772dcef3")
+        (revision "0"))
+    (tree-sitter-grammar
+     "verilog" "Verilog"
+     "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k"
+     (git-version version revision commit)
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           (delete-file-recursively "bindings"))))))

base-commit: 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3
-- 
2.41.0

Karl Hallsby wrote on 10 May 20:28 +0200

[PATCH 2/3] gnu: Add tree-sitter-vhdl.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:4eaac81a00ac27ac39e4ff1a2c8124f7b10918b3.1715365716.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-vhdl): New variable.

Change-Id: I07b2b89f878957af1544344122cdfe8970efc9f7

---

gnu/packages/tree-sitter.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (42 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 206fd7268e..3863558883 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -717,3 +717,35 @@ (define-public tree-sitter-verilog
            (use-modules (guix build utils))
            (delete-file "binding.gyp")
            (delete-file-recursively "bindings"))))))
+
+(define-public tree-sitter-vhdl
+  (let ((version "0.1.1") ; In package.json, but untagged
+        (commit "a3b2d84990527c7f8f4ae219c332c00c33d2d8e5")
+        (revision "0"))
+    (tree-sitter-grammar
+     "vhdl" "VHDL"
+     "0gz2b0qg1jzi2q6wgj6k6g35kmni3pqglq4f5kblkxx909463n8a"
+     (git-version version revision commit)
+     #:repository-url "https://github.com/alemuller/tree-sitter-vhdl"
+     #:commit commit
+     #:get-cleanup-snippet
+     (lambda _
+       #~(begin
+           (use-modules (guix build utils))
+           (delete-file "binding.gyp")
+           ;; tree-sitter-vhdl does not have bindings/ directory.
+           (delete-file "src/grammar.json")
+           (delete-file "src/node-types.json")
+           (delete-file "src/parser.c")
+           (delete-file-recursively "src/tree_sitter")
+           ;; Fix a query error in the highlight.scm query test. This would be
+           ;; easier with a patch, but this works too, and we still get to use
+           ;; tree-sitter-grammar. The fix is taken from here:
+           ;; https://github.com/n8tlarsen/tree-sitter-vhdl/commit/dabf157c6bb7220d72d3ceba0ce1abd90bf62187
+           ;; This is a documented issue that has not been resolved for nearly 2
+           ;; years.
+           ;; https://github.com/alemuller/tree-sitter-vhdl/issues/2
+           (substitute* "queries/highlights.scm"
+             (("\\(integer_decimal\n") "(integer_decimal)\n")
+             (("\\(integer\\)") "")
+             (("\"0\")") "\"0\"")))))))
-- 
2.41.0

Karl Hallsby wrote on 10 May 20:28 +0200

[PATCH 3/3] gnu: Add tree-sitter-erlang.

Recipients:(address . 70720@debbugs.gnu.org)(name . Karl Hallsby)(address . karl@hallsby.com)

Message-ID:cd0b485ce28e45c191bac5ac8e611a64c3b0dd68.1715365716.git.karl@hallsby.com

* gnu/packages/tree-sitter.scm (tree-sitter-erlang): New variable.

Change-Id: I99cdde6418e04d4898f0f6509d2e7d849e2a4f22

---

gnu/packages/tree-sitter.scm | 12 ++++++++++++

1 file changed, 12 insertions(+)

Toggle diff (25 lines)diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 3863558883..c6e84bc85b 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -426,6 +426,18 @@ (define-public tree-sitter-dockerfile
    "0.1.2"
    #:repository-url "https://github.com/camdencheek/tree-sitter-dockerfile"))
 
+(define-public tree-sitter-erlang
+  ;; Versions newer than 0.4.0 use tree-sitter 0.22.1
+  (let ((version "0.4.0") ; In Cargo.toml, but untagged
+        (commit "57e69513efd831f9cc8207d65d96bad917ca4aa4")
+        (revision "0"))
+  (tree-sitter-grammar
+   "erlang" "Erlang"
+   "1h0c9qc6i0kz5a0yq68xp623f84g4mc8hcp00khdbf7y7z7b9izc"
+   (git-version version revision commit)
+   #:repository-url "https://github.com/WhatsApp/tree-sitter-erlang"
+   #:commit commit)))
+
 (define-public tree-sitter-elm
   (tree-sitter-grammar
    "elm" "Elm"
-- 
2.41.0

Zheng Junjie wrote on 13 May 18:40 +0200

Re: [bug#70720] [PATCH 0/3] Add tree-sitter-verilog/-vhdl/-erlang

Recipients:(name . Karl Hallsby via Guix-patches via)(address . guix-patches@gnu.org)

Message-ID:87y18dy8a0.fsf@iscas.ac.cn

Karl Hallsby via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (16 lines)> Verilog & VHDL have Emacs major modes for them.  I have tested that both
> verilog-ts-mode and vhdl-ts-mode produce syntax highlighting.
>
> Erlang does not have a tree-sitter-powered major-mode for Emacs yet.
>
> Karl Hallsby (3):
>   gnu: Add tree-sitter-verilog.
>   gnu: Add tree-sitter-vhdl.
>   gnu: Add tree-sitter-erlang.
>
>  gnu/packages/tree-sitter.scm | 58 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 58 insertions(+)
>
>
> base-commit: 5010a51fc91aeac5a3b87a3eea04f18f3fe8a3a3

push, see
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=65186deae436f419fbe56a88d097181453728a29
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=6b6ad68559ef57764af6460aef6d5cd46fab06eb
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=b23aa4c1d6ebbbee316d2f2bee87ad4ce7c67345

Your comment

This issue is archived.

To comment on this conversation send an email to 70720@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 70720

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date