Skip to content

Make sure any variable names that are javascript keywords are handled… #370

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

Merged
bryanjos merged 1 commit into from
Aug 27, 2017
Merged

Make sure any variable names that are javascript keywords are handled… #370

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed
- Make sure not to add underscores to erlang functions
- Make sure any variable names that are javascript keywords are handled properly

## [0.30.0] - 2017-08-15

Expand Down
37 changes: 35 additions & 2 deletions lib/elixir_script/passes/translate/form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,39 @@ defmodule ElixirScript.Translate.Form do
alias ElixirScript.Translate.Clause
require Logger

@js_reserved_words [
:break,
:case,
:class,
:const,
:continue,
:debugger,
:default,
:delete,
:do,
:else,
:export,
:extends,
:finally,
:function,
:if,
:import,
:in,
:instanceof,
:new,
:return,
:super,
:switch,
:throw,
:try,
:typeof,
:var,
:void,
:while,
:with,
:yield
]

def compile!(ast, state) do
{js_ast, _} = compile(ast, state)

Expand Down Expand Up @@ -369,10 +402,10 @@ defmodule ElixirScript.Translate.Form do
end
end

def compile({:default, meta, _}, state) do
def compile({var, meta, _}, state) when var in @js_reserved_words do
counter = Pattern.get_counter(meta)

var = :__default__
var = String.to_atom("__#{var}__")
var = Pattern.get_variable_name(to_string(var) <> counter, state)
{ ElixirScript.Translate.Identifier.make_identifier(var), state }
end
Expand Down