Skip to content

Commit 4e03a0e

Browse files
authored
Merge pull request #40 from loopsocial/namespace-parsers
Namespace leex/yecc modules to localize_* to coexist with ex_cldr
2 parents 7b3cc23 + db7b25d commit 4e03a0e

12 files changed

Lines changed: 13 additions & 13 deletions

lib/localize/datetime/format/compiler.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ defmodule Localize.DateTime.Format.Compiler do
3434
def tokenize(format_string) when is_binary(format_string) do
3535
format_string
3636
|> String.to_charlist()
37-
|> :date_time_format_lexer.string()
37+
|> :localize_date_time_format_lexer.string()
3838
|> maybe_add_decimal_separator()
3939
|> maybe_return_error(format_string)
4040
end
@@ -67,7 +67,7 @@ defmodule Localize.DateTime.Format.Compiler do
6767
[first | seconds_followed_by_fraction(rest)]
6868
end
6969

70-
defp maybe_return_error({:error, {_, :date_time_format_lexer, {_, error}}, _}, format) do
70+
defp maybe_return_error({:error, {_, :localize_date_time_format_lexer, {_, error}}, _}, format) do
7171
{:error,
7272
Localize.DateTimeFormatError.exception(
7373
format: format,

lib/localize/number/format/compiler.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ defmodule Localize.Number.Format.Compiler do
6060
def tokenize(definition) when is_binary(definition) do
6161
definition
6262
|> String.to_charlist()
63-
|> :decimal_formats_lexer.string()
63+
|> :localize_decimal_formats_lexer.string()
6464
end
6565

6666
@doc """
@@ -88,7 +88,7 @@ defmodule Localize.Number.Format.Compiler do
8888
"""
8989
@spec parse(String.t() | list()) :: {:ok, Keyword.t()} | {:error, term()}
9090
def parse(tokens) when is_list(tokens) do
91-
:decimal_formats_parser.parse(tokens)
91+
:localize_decimal_formats_parser.parse(tokens)
9292
end
9393

9494
def parse("") do
@@ -97,7 +97,7 @@ defmodule Localize.Number.Format.Compiler do
9797

9898
def parse(definition) when is_binary(definition) do
9999
{:ok, tokens, _end_line} = tokenize(definition)
100-
:decimal_formats_parser.parse(tokens)
100+
:localize_decimal_formats_parser.parse(tokens)
101101
end
102102

103103
def parse(nil) do

lib/localize/number/plural_rules/compiler.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ defmodule Localize.Number.PluralRule.Compiler do
33

44
# Compiles CLDR plural rule definitions into Elixir AST.
55
#
6-
# Uses the Erlang leex lexer (`:plural_rules_lexer`) and yecc parser
7-
# (`:plural_rules_parser`) to tokenize and parse rule definitions
6+
# Uses the Erlang leex lexer (`:localize_plural_rules_lexer`) and yecc parser
7+
# (`:localize_plural_rules_parser`) to tokenize and parse rule definitions
88
# from the ICU/CLDR plural rules syntax.
99

1010
@doc """
@@ -27,7 +27,7 @@ defmodule Localize.Number.PluralRule.Compiler do
2727
def tokenize(definition) when is_binary(definition) do
2828
definition
2929
|> String.to_charlist()
30-
|> :plural_rules_lexer.string()
30+
|> :localize_plural_rules_lexer.string()
3131
end
3232

3333
@doc """
@@ -49,11 +49,11 @@ defmodule Localize.Number.PluralRule.Compiler do
4949
5050
"""
5151
def parse(tokens) when is_list(tokens) do
52-
:plural_rules_parser.parse(tokens)
52+
:localize_plural_rules_parser.parse(tokens)
5353
end
5454

5555
def parse(definition) when is_binary(definition) do
5656
{:ok, tokens, _end_line} = tokenize(definition)
57-
:plural_rules_parser.parse(tokens)
57+
:localize_plural_rules_parser.parse(tokens)
5858
end
5959
end

lib/localize/number/rbnf/rule.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ defmodule Localize.Number.Rbnf.Rule do
5959
definition
6060
|> String.trim_leading("'")
6161
|> String.to_charlist()
62-
|> :rbnf_lexer.string()
62+
|> :localize_rbnf_lexer.string()
6363
end
6464

6565
def tokenize(%__MODULE__{definition: definition}) do
@@ -86,6 +86,6 @@ defmodule Localize.Number.Rbnf.Rule do
8686
end
8787

8888
def parse(tokens) when is_list(tokens) do
89-
:rbnf_parser.parse(tokens)
89+
:localize_rbnf_parser.parse(tokens)
9090
end
9191
end

0 commit comments

Comments
 (0)