mergiraf/mergiraf
mergiraf/mergiraf
9
213
Fork 45
Code Issues 51 Pull requests 7 Releases 19 Activity Actions

feat: Add support for GNU Make #510

Merged
wetneb merged 2 commits from twz123/mergiraf:add-make into main 2025-07-23 12:42:37 +02:00
Conversation 2 Commits 2 Files changed 16 +64
twz123 commented 2025-07-19 13:17:06 +02:00
Contributor
Copy link

(Still figuring out the right tree-sitter queries and examples. If we had support for shell, we could even think about an injection for recipe_line / shell_command. Ugh, what a rabbit hole 😅)

Atomic nodes: recipe_line, shell_command, and raw_text typically hold shell commands or uninterpreted text. Better don't try to merge those.

Commutative parents: Prerequisite lists such as foo: bar baz are represented by list or pattern_list nodes. Make does not care about the order of prerequisites, so new prerequisites can be added in different positions without creating real conflicts.

Signatues: Variable assignments are uniquely identified by their variable name, and rules are keyed by their target. Prevent duplicating them.

Fixes #491.

(Still figuring out the right tree-sitter queries and examples. If we had support for shell, we could even think about an injection for recipe_line / shell_command. Ugh, what a rabbit hole 😅) Atomic nodes: recipe_line, shell_command, and raw_text typically hold shell commands or uninterpreted text. Better don't try to merge those. Commutative parents: Prerequisite lists such as `foo: bar baz` are represented by list or pattern_list nodes. Make does not care about the order of prerequisites, so new prerequisites can be added in different positions without creating real conflicts. Signatues: Variable assignments are uniquely identified by their variable name, and rules are keyed by their target. Prevent duplicating them. Fixes #491.
❤️ 1
feat: Add support for GNU Make
All checks were successful
/ test (pull_request) Successful in 1m31s
Details
5b26c5598e
 
Signed-off-by: Tom Wieczorek <tom@bibbu.net>
wetneb commented 2025-07-21 22:37:33 +02:00
Owner
Copy link

This looks absolutely fantastic as it stands! :)
Let us know if you need any support for the tree-sitter queries. Beyond the possible language injection, do you need them to add specific commutative parents?

This looks absolutely fantastic as it stands! :) Let us know if you need any support for the tree-sitter queries. Beyond the possible language injection, do you need them to add specific commutative parents?
twz123 changed title from WIP: feat: Add support for GNU Make to feat: Add support for GNU Make 2025-07-23 11:35:53 +02:00
twz123 commented 2025-07-23 11:38:04 +02:00
Author
Contributor
Copy link

Thanks! I'm removing the WIP because I'm not sure when I'll have time to look at this again. It definitely won't be in the next few weeks, so it's better not to let this linger for too long.

Thanks! I'm removing the WIP because I'm not sure when I'll have time to look at this again. It definitely won't be in the next few weeks, so it's better not to let this linger for too long.
wetneb approved these changes 2025-07-23 12:41:52 +02:00
src/supported_langs.rs
@ -1014,0 +1019,4 @@
language: tree_sitter_make::LANGUAGE.into(),
atomic_nodes: vec!["recipe_line", "shell_command", "raw_text"],
commutative_parents: vec![
CommutativeParent::without_delimiters("list", " "),
wetneb commented 2025-07-23 12:41:48 +02:00
Owner
Copy link

I was a bit worried to see that all lists are made commutative, but looking at the grammar, this node type seems to be only used in places where it does make sense.

I was a bit worried to see that all lists are made commutative, but looking at the grammar, this node type seems to be only used in places where it does make sense.
wetneb merged commit a63afa8b43 into main 2025-07-23 12:42:37 +02:00
wetneb referenced this pull request from a commit 2025-07-23 12:42:38 +02:00
feat: Add support for GNU Make (#510)
twz123 deleted branch add-make 2025-07-23 13:54:23 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
wetneb
Labels
Clear labels   
Compat/Breaking

Breaking change that won't be backward compatible

  
Kind
Bad merge
Examples where the merging algorithm doesn't work as well as it should

  
Kind
Bug
Something is not working

  
Kind
Documentation
Documentation changes

  
Kind
Enhancement
Improve existing functionality

  
Kind
Feature
New functionality

  
Kind
New language

  
Kind
Security
This is security issue

  
Kind
Testing
Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind
Bad merge
Kind
Bug
Kind
Documentation
Kind
Enhancement
Kind
Feature
Kind
New language
Kind
Security
Kind
Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: mergiraf/mergiraf#510
No description provided.
Delete branch "twz123/mergiraf:add-make"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?