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

Improve symbol tokenization. #98

Merged
merged 5 commits into from May 11, 2020
Merged

Improve symbol tokenization. #98

merged 5 commits into from May 11, 2020

Conversation

@j-piecuch
Copy link
Contributor

j-piecuch commented May 10, 2020

#97 incorrectly handles multi-character symbols such as ==.
This PR fixes #94 while correctly tokenizing multi-character symbols.

j-piecuch added 4 commits May 10, 2020
This reverts commit 32b013c, reversing
changes made to ecf0050.
I can't remember why I put it there... this case seems to handle
symbols, but we're already handling them.
@matthewbauer
Copy link
Member

matthewbauer commented May 11, 2020

Thanks! I completely screwed up that new test case.

I see that there is an error in the test suite though. Any idea what those are from?

`signum` is defined in `cl`, which is not required by `nix-mode`.
I don't think the use of such a simple function warrants an additional
import, so I decided to inline it.
@j-piecuch
Copy link
Contributor Author

j-piecuch commented May 11, 2020

The tests failed due to signum (provided by cl) not being in scope. I fixed it by inlining its use.

@matthewbauer matthewbauer merged commit 9043a8d into NixOS:master May 11, 2020
1 check passed
1 check passed
Travis CI - Pull Request Build Passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants
You can’t perform that action at this time.