Skip to content

update v14.2 #12

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

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

update v14.2 #12

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
2 changes: 1 addition & 1 deletion lib/mustache/mix/tasks/spec.generate.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ defmodule Mix.Tasks.Spec.Generate do
end

def to_keyword({ key, value }) when is_binary(key) do
{ binary_to_atom(key), to_keyword(value) }
{ String.to_atom(key), to_keyword(value) }
end

def to_keyword(other), do: other
Expand Down
20 changes: 10 additions & 10 deletions lib/mustache/tokenizer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ defmodule Mustache.Tokenizer do
var == :. ->
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_dot, line, var } | acc])
to_string(var) =~ ~r/^\w+(\.\w+)+$/ ->
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_dotted_name, line, atoms } | acc])
true ->
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_variable, line, var } | acc])
Expand All @@ -97,7 +97,7 @@ defmodule Mustache.Tokenizer do
var == :. ->
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_dot, line, var } | acc])
to_string(var) =~ ~r/^\w+(\.\w+)+$/ ->
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_dotted_name, line, atoms } | acc])
true ->
tokenize(rest, tags, new_line, new_line, [], [{ :unescaped_variable, line, var } | acc])
Expand All @@ -113,7 +113,7 @@ defmodule Mustache.Tokenizer do
maybe_line_break = if line_break_flg, do: [:line_break], else: []

if to_string(var) =~ ~r/^\w+(\.\w+)+$/ do
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :dotted_name_section, line, atoms } | acc])
else
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :section, line, var } | acc])
Expand All @@ -129,7 +129,7 @@ defmodule Mustache.Tokenizer do
maybe_line_break = if line_break_flg, do: [:line_break], else: []

if to_string(var) =~ ~r/^\w+(\.\w+)+$/ do
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :dotted_name_inverted_section, line, atoms } | acc])
else
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :inverted_section, line, var } | acc])
Expand All @@ -145,7 +145,7 @@ defmodule Mustache.Tokenizer do
maybe_line_break = if line_break_flg, do: [:line_break], else: []

if to_string(var) =~ ~r/^\w+(\.\w+)+$/ do
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :end_section, line, atoms } | acc])
else
tokenize(rest, tags, new_line, new_line, [], maybe_line_break ++ [{ :end_section, line, var } | acc])
Expand All @@ -172,7 +172,7 @@ defmodule Mustache.Tokenizer do
var == :. ->
tokenize(rest, tags, new_line, new_line, [], [{ :dot, line, var } | acc])
to_string(var) =~ ~r/^\w+(\.\w+)+$/ ->
atoms = to_string(var) |> String.split(".") |> Enum.map(&binary_to_atom(&1))
atoms = to_string(var) |> String.split(".") |> Enum.map(&String.to_atom(&1))
tokenize(rest, tags, new_line, new_line, [], [{ :dotted_name, line, atoms } | acc])
true ->
tokenize(rest, tags, new_line, new_line, [], [{ :variable, line, var } | acc])
Expand Down Expand Up @@ -242,13 +242,13 @@ defmodule Mustache.Tokenizer do
_ when buffer == [] ->
raise SyntaxError, line: line, description: "No contents in tag"
[?\r,?\n|t] when ignore_break_flg ->
{ buffer |> Enum.reverse |> list_to_atom, line, t, true }
{ buffer |> Enum.reverse |> List.to_atom, line, t, true }
[?\n|t] when ignore_break_flg ->
{ buffer |> Enum.reverse |> list_to_atom, line, t, true }
{ buffer |> Enum.reverse |> List.to_atom, line, t, true }
[] when ignore_break_flg ->
{ buffer |> Enum.reverse |> list_to_atom, line, '', true }
{ buffer |> Enum.reverse |> List.to_atom, line, '', true }
t ->
{ buffer |> Enum.reverse |> list_to_atom, line, t, false }
{ buffer |> Enum.reverse |> List.to_atom, line, t, false }
end
_ ->
case string do
Expand Down