diff options
| author | José Valim <[email protected]> | 2016-06-01 20:48:58 +0200 |
|---|---|---|
| committer | José Valim <[email protected]> | 2016-09-26 11:15:03 +0200 |
| commit | b8d1855529236e9d8320bff326d30aefae518354 (patch) | |
| tree | 080374c28ab7cddbec2907fffa86cd499704734a /lib/compiler/src | |
| parent | 7228e3ea97f8e2a19be97740053892e67cc20baf (diff) | |
| download | otp-b8d1855529236e9d8320bff326d30aefae518354.tar.gz otp-b8d1855529236e9d8320bff326d30aefae518354.tar.bz2 otp-b8d1855529236e9d8320bff326d30aefae518354.zip | |
Use @ in variable names generated by core and kernel
The previous variable names can be generated by
projects like LFE and Elixir, leading to possible
conflicts. Our first to choice to solve such conflicts
was to use $ but that's not a valid variable name in core.
Therefore we picked @ which is currently supported and
still reduces the chance of conflicts.
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/sys_core_fold.erl | 2 | ||||
| -rw-r--r-- | lib/compiler/src/v3_core.erl | 2 | ||||
| -rw-r--r-- | lib/compiler/src/v3_kernel.erl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl index caa30a5ef4..00fb420d5f 100644 --- a/lib/compiler/src/sys_core_fold.erl +++ b/lib/compiler/src/sys_core_fold.erl @@ -2109,7 +2109,7 @@ make_var(A) -> make_var_name() -> N = get(new_var_num), put(new_var_num, N+1), - list_to_atom("fol"++integer_to_list(N)). + list_to_atom("@f"++integer_to_list(N)). letify(Bs, Body) -> Ann = cerl:get_ann(Body), diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl index b96d3df8fe..f40cf97f57 100644 --- a/lib/compiler/src/v3_core.erl +++ b/lib/compiler/src/v3_core.erl @@ -1958,7 +1958,7 @@ new_fun_name(Type, #core{fcount=C}=St) -> %% new_var_name(State) -> {VarName,State}. new_var_name(#core{vcount=C}=St) -> - {list_to_atom("cor" ++ integer_to_list(C)),St#core{vcount=C + 1}}. + {list_to_atom("@c" ++ integer_to_list(C)),St#core{vcount=C + 1}}. %% new_var(State) -> {{var,Name},State}. %% new_var(LineAnno, State) -> {{var,Name},State}. diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl index b4bbc5e739..cd42700365 100644 --- a/lib/compiler/src/v3_kernel.erl +++ b/lib/compiler/src/v3_kernel.erl @@ -880,7 +880,7 @@ new_fun_name(Type, #kern{func={F,Arity},fcount=C}=St) -> %% new_var_name(State) -> {VarName,State}. new_var_name(#kern{vcount=C}=St) -> - {list_to_atom("ker" ++ integer_to_list(C)),St#kern{vcount=C+1}}. + {list_to_atom("@k" ++ integer_to_list(C)),St#kern{vcount=C+1}}. %% new_var(State) -> {#k_var{},State}. |