From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 70720@debbugs.gnu.org
Cc: cox.katherine.e+guix@gmail.com, karl@hallsby.com,
liliana.prikler@gmail.com, andrew@trop.in
Subject: [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl.
Date: Fri, 10 May 2024 20:14:24 +0800 [thread overview]
Message-ID: <87seypc19b.fsf@iscas.ac.cn> (raw)
In-Reply-To: <1cc45cfd22fb89cc16ef6d9bdb26f5b0d53afbf7.1714663253.git.karl@hallsby.com> (Karl Hallsby via Guix-patches via's message of "Thu, 2 May 2024 10:39:22 -0500")
[-- Attachment #1: Type: text/plain, Size: 2605 bytes --]
Karl Hallsby via Guix-patches via <guix-patches@gnu.org> writes:
> * 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
> + #: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\"")))))))
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2024-05-10 12:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-02 15:36 [bug#70720] [PATCH 0/3] Add tree-sitter-verilog/-vhdl/-erlang Karl Hallsby via Guix-patches via
2024-05-02 15:39 ` [bug#70720] [PATCH 1/3] gnu: Add tree-sitter-verilog Karl Hallsby via Guix-patches via
2024-05-10 12:16 ` Zheng Junjie
2024-05-02 15:39 ` [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl Karl Hallsby via Guix-patches via
2024-05-10 12:14 ` Zheng Junjie [this message]
2024-05-02 15:39 ` [bug#70720] [PATCH 3/3] gnu: Add tree-sitter-erlang Karl Hallsby via Guix-patches via
2024-05-10 12:18 ` Zheng Junjie
2024-05-10 16:26 ` [bug#70720] [PATCH 1/3] gnu: Add tree-sitter-verilog Karl Hallsby via Guix-patches via
2024-05-10 16:26 ` [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl Karl Hallsby via Guix-patches via
2024-05-10 16:26 ` [bug#70720] [PATCH 3/3] gnu: Add tree-sitter-erlang Karl Hallsby via Guix-patches via
2024-05-10 16:49 ` [bug#70720] [PATCH 1/3] gnu: Add tree-sitter-verilog Liliana Marie Prikler
2024-05-10 18:28 ` Karl Hallsby via Guix-patches via
2024-05-10 18:28 ` [bug#70720] [PATCH 2/3] gnu: Add tree-sitter-vhdl Karl Hallsby via Guix-patches via
2024-05-10 18:28 ` [bug#70720] [PATCH 3/3] gnu: Add tree-sitter-erlang Karl Hallsby via Guix-patches via
2024-05-13 16:40 ` [bug#70720] [PATCH 0/3] Add tree-sitter-verilog/-vhdl/-erlang Zheng Junjie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87seypc19b.fsf@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=70720@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
--cc=karl@hallsby.com \
--cc=liliana.prikler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.