Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/localize/datetime/format/compiler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ defmodule Localize.DateTime.Format.Compiler do
def tokenize(format_string) when is_binary(format_string) do
format_string
|> String.to_charlist()
|> :date_time_format_lexer.string()
|> :localize_date_time_format_lexer.string()
|> maybe_add_decimal_separator()
|> maybe_return_error(format_string)
end
Expand Down Expand Up @@ -67,7 +67,7 @@ defmodule Localize.DateTime.Format.Compiler do
[first | seconds_followed_by_fraction(rest)]
end

defp maybe_return_error({:error, {_, :date_time_format_lexer, {_, error}}, _}, format) do
defp maybe_return_error({:error, {_, :localize_date_time_format_lexer, {_, error}}, _}, format) do
{:error,
Localize.DateTimeFormatError.exception(
format: format,
Expand Down
6 changes: 3 additions & 3 deletions lib/localize/number/format/compiler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ defmodule Localize.Number.Format.Compiler do
def tokenize(definition) when is_binary(definition) do
definition
|> String.to_charlist()
|> :decimal_formats_lexer.string()
|> :localize_decimal_formats_lexer.string()
end

@doc """
Expand Down Expand Up @@ -88,7 +88,7 @@ defmodule Localize.Number.Format.Compiler do
"""
@spec parse(String.t() | list()) :: {:ok, Keyword.t()} | {:error, term()}
def parse(tokens) when is_list(tokens) do
:decimal_formats_parser.parse(tokens)
:localize_decimal_formats_parser.parse(tokens)
end

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

def parse(definition) when is_binary(definition) do
{:ok, tokens, _end_line} = tokenize(definition)
:decimal_formats_parser.parse(tokens)
:localize_decimal_formats_parser.parse(tokens)
end

def parse(nil) do
Expand Down
10 changes: 5 additions & 5 deletions lib/localize/number/plural_rules/compiler.ex
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ defmodule Localize.Number.PluralRule.Compiler do

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

@doc """
Expand All @@ -27,7 +27,7 @@ defmodule Localize.Number.PluralRule.Compiler do
def tokenize(definition) when is_binary(definition) do
definition
|> String.to_charlist()
|> :plural_rules_lexer.string()
|> :localize_plural_rules_lexer.string()
end

@doc """
Expand All @@ -49,11 +49,11 @@ defmodule Localize.Number.PluralRule.Compiler do

"""
def parse(tokens) when is_list(tokens) do
:plural_rules_parser.parse(tokens)
:localize_plural_rules_parser.parse(tokens)
end

def parse(definition) when is_binary(definition) do
{:ok, tokens, _end_line} = tokenize(definition)
:plural_rules_parser.parse(tokens)
:localize_plural_rules_parser.parse(tokens)
end
end
4 changes: 2 additions & 2 deletions lib/localize/number/rbnf/rule.ex
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ defmodule Localize.Number.Rbnf.Rule do
definition
|> String.trim_leading("'")
|> String.to_charlist()
|> :rbnf_lexer.string()
|> :localize_rbnf_lexer.string()
end

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

def parse(tokens) when is_list(tokens) do
:rbnf_parser.parse(tokens)
:localize_rbnf_parser.parse(tokens)
end
end
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion test/localize/number/rbnf_rule_processor_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ defmodule Localize.Number.RbnfRuleProcessorTest do
end

test "returns a parser error for an unterminated construct" do
assert {:error, {1, :rbnf_parser, _reason}} = Rule.parse("twenty[->>];")
assert {:error, {1, :localize_rbnf_parser, _reason}} = Rule.parse("twenty[->>];")
end
end

Expand Down
Loading