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

AST/Parser changes (From #34&#32, separated into this PR) #36

Merged
merged 2 commits into from
Oct 5, 2021

Conversation

ThePuzzlemaker
Copy link
Contributor

Patched out editor for now just because it'd be too borked for now

Patched out editor for now just because it'd be too borked

Co-authored-by: Caden Haustein <code@brightlysalty.33mail.com>
@ThePuzzlemaker ThePuzzlemaker changed the title AST/Parser changes AST/Parser changes (From other #34&#32, separated into this PR) Oct 4, 2021
@ThePuzzlemaker ThePuzzlemaker changed the title AST/Parser changes (From other #34&#32, separated into this PR) AST/Parser changes (From #34&#32, separated into this PR) Oct 4, 2021
Copy link
Collaborator

@brightly-salty brightly-salty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise, looks good to me. Once that's fixed, I'd be happy to merge

Cargo.toml Outdated Show resolved Hide resolved
@brightly-salty brightly-salty merged commit b7f1cef into mlatu-lang:rust Oct 5, 2021
@ThePuzzlemaker ThePuzzlemaker deleted the ast-parser-changes branch October 5, 2021 00:12
brightly-salty added a commit that referenced this pull request Oct 7, 2021
* Initial Rust work

* Fix clippy hints, better error handling

* Build time + runtime improvements

* Add structured editor

* Fix prelude and allow newlines/CR (#31)

* AST/Parser changes (From #34&#32, separated into this PR) (#36)

* AST/parser changes, remove anyhow

Patched out editor for now just because it'd be too borked

Co-authored-by: Caden Haustein <code@brightlysalty.33mail.com>

* Use unic-ucd-category intead of unic-ucd

Co-authored-by: Caden Haustein <code@brightlysalty.33mail.com>

* [WIP] Improved codegen (#34)

* UI improvements for structural editor (#32)

* Use std::fmt for centering, add labels for halves

This makes everything cleaner! With some algebra and code™, it's
possible to use `format!` for centering text.

This commit also adds labels to the pattern and replacement half, just
being centered boxes `| Pattern |` and `| Replacement |` in the usually
bland `--------`(...) line after the status.

* Fix rule index (off-by-one errors go brrr)

* Switch from termion to crossterm

Squash of:
- Switch from termion to crossterm (@brightly-salty)
- Abstract away a view for easier layouting (@brightly-salty)
- Add lockfile (@ThePuzzlemaker)
- Undo some AST/parser changes (@ThePuzzlemaker)

Co-authored-by: ThePuzzlemaker <tpzker@thepuzzlemaker.info>

* Fix code for new AST, make pretty_rule use &[Term] instead of Vec<Term>

* Rebase and fix

* Add failing interactive mode

* Improve interactive rewriter

* Fix prelude + mlatu.pl

* Add CLI + standardize keybindings

Co-authored-by: Caden Haustein <code@brightlysalty.33mail.com>

* Update documentation

Co-authored-by: James [Undefined] <tpzker@thepuzzlemaker.info>
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.

2 participants