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.

Sign up for GitHub

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

Rename lexer and parser to prevent conflicts #54

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename lexer and parser to prevent conflicts #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ erl_crash.dump
*.ez
erlex-*.tar
.elixir_ls
src/parser.erl
src/lexer.erl
src/erlex_parser.erl
src/erlex_lexer.erl

/priv/plts/
4 changes: 2 additions & 2 deletions lib/erlex.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defmodule Erlex do

defp lex(str) do
try do
{:ok, tokens, _} = :lexer.string(str)
{:ok, tokens, _} = :erlex_lexer.string(str)
tokens
rescue
_ ->
Expand All @@ -52,7 +52,7 @@ defmodule Erlex do

defp parse(tokens) do
try do
{:ok, [first | _]} = :parser.parse(tokens)
{:ok, [first | _]} = :erlex_parser.parse(tokens)
first
rescue
_ ->
Expand Down
4 changes: 2 additions & 2 deletions mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ defmodule Erlex.MixProject do
"mix.exs",
"README.md",
"LICENSE.md",
"src/lexer.xrl",
"src/parser.yrl"
"src/erlex_lexer.xrl",
"src/erlex_parser.yrl"
],
maintainers: ["Andrew Summers"],
licenses: ["Apache-2.0"],
Expand Down
0 src/lexer.xrl → src/erlex_lexer.xrl
View file
Open in desktop
File renamed without changes.
0 src/parser.yrl → src/erlex_parser.yrl
View file
Open in desktop
File renamed without changes.