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

Jump to bottom

Clean up several minor bugbears in elixir-smie. #75

Merged
merged 16 commits into from Aug 16, 2014
Merged

Clean up several minor bugbears in elixir-smie. #75

merged 16 commits into from Aug 16, 2014

Conversation

mattdeboard
Copy link
Contributor

The changes are as follows:

  1. Removed COMMA from the list of block intro keywords. This was the source of a whole class of problems.
  2. Removed the unused second parameter from the signature for elixir-smie-next-token-no-lookaround.
  3. elixir-smie-grammar is now a constant.
  4. Changed code layout of elixir-smie-grammar.
  5. Removed several elixir-smie-rules that were rendered redundant with changes in Remove special indentation rules for operators, except booleans. #74.
  6. Removed a test that was testing deprecated syntax.

@mattdeboard
Move priority of ';' token to top.
ae5c64d
@mattdeboard
Add operator table a la octave.el and ruby-mode.el.
868372e
@mattdeboard
Reformat the bnf->prec2 table.
de81804
@mattdeboard
Merge in the operator table.
e7162e7
@mattdeboard
Remove the 'resolvers' from bnf->prec2 fn call
e7ccd43 
At this point I have basically sanded down elixir-mode's grammar spec to
some pretty bare bones.
@mattdeboard
Move defrecord grammar to top.
5d3aea6
@mattdeboard
Remove the operator table for now.
fb57ed9
@mattdeboard
Remove COMMA and OP from list of block-opener keywords.
2de867e
@mattdeboard
Remove SMIE rules no longer necessary.
0ef53a1
@mattdeboard
Remove unused parameter from elixir-smie-next-token-no-lookaround.
f2898b6
@mattdeboard
Remove test of deprecated syntax.
08afdba
@mattdeboard
Put back the one-line if statements.
4dadc78
@mattdeboard
Remove operator table.
96738f4
@mattdeboard
Remove 'OP' from the gramar as it causes more problems than it's worth.
cd097ea
@mattdeboard
Add smie rule for after ';' tokens.
31b1e24
@mattdeboard
Remove smie-merge-prec2s call.
2986d43
mattdeboard added a commit that referenced this pull request Aug 16, 2014
@mattdeboard
Merge pull request #75 from elixir-lang/rejigger-smie-grammar
6f8769a 
Clean up several minor bugbears in elixir-smie.
@mattdeboard mattdeboard merged commit 6f8769a into master Aug 16, 2014
@mattdeboard mattdeboard deleted the rejigger-smie-grammar branch August 16, 2014 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@mattdeboard