Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support Tact 1.6.0 #45

Merged
merged 21 commits into from
Mar 12, 2025
Merged

feat: support Tact 1.6.0 #45

merged 21 commits into from
Mar 12, 2025

Conversation

novusnota
Copy link
Member

@novusnota novusnota commented Nov 11, 2024

Towards #51
Closes #48
Closes #49

@novusnota novusnota force-pushed the towards-1.6.0 branch 2 times, most recently from 91ee103 to 00e57df Compare February 7, 2025 18:25
Additionally, a lot of choices were made to better accomodate the future
Tact assembly grammar (not in syntax, but in node names and layout) and
facilitate language server use

Closes #49
@novusnota novusnota mentioned this pull request Feb 24, 2025
4 tasks
@novusnota
Copy link
Member Author

novusnota commented Mar 7, 2025

This got stale, whoops — will complete and merge soon (today/tomorrow)

Planned:

  • Type fixes
  • [ ] Asm fallbacks (for {}: and fift macros)
    • fix method names for [INLINE]CALLDICT calls
  • Query updates and minor clean-up

Once merged, the queries should be promptly submitted to relevant upstream Neovim repos

UPD: After a bunch of testing decided not to add most fallbacks to Fift asm, since that destroys more intelligent captures entirely. Thus, only added the support for function names as arguments, which are used in instructions like INLINECALLDICT.

* upgraded to tree-sitter-cli 0.25.3, added tree-sitter.json config and
re-generated all bindings
* bumped tree-sitter-tact version to 1.6.0
* overhauled the types in grammar.js (seem to work fine)
* resolved some of the issues in asm functions: decided not to add
fallback support for `{ ... } :` and other Fift-specific things and
macros, because that drops the intelligence of our parsing back to where
we couldn't properly label anything AND we'll get rid of Fift soon
anyways, so that can wait.
@novusnota novusnota marked this pull request as ready for review March 12, 2025 10:58
@novusnota novusnota merged commit 19fecce into main Mar 12, 2025
3 checks passed
@novusnota novusnota deleted the towards-1.6.0 branch March 12, 2025 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adjust asm parsing to upstream Tact compiler parser Upgrade to v0.25.1
2 participants