Rename atom to symbols

Symbols are a more common name for this type in other languages, though
this does break with the Erlang/Elixir convention

Author: bbridges

src/aero_ast.erl

@@ -5,7 +5,7 @@
 -export([meta/1, metas/1]).
 
 -export_type([t/0, source/0]).
--export_type([int_lit/0, float_lit/0, atom_lit/0, str_lit/0]).
+-export_type([int_lit/0, float_lit/0, sym_lit/0, str_lit/0]).
 -export_type([ident/0, type_param/0, blank/0, op/0]).
 -export_type([block/0, expand/0, args/0, tag/0, attr/0, inner_attr/0]).
 
@@ -17,7 +17,7 @@
 -type t() :: source()
            | int_lit()
            | float_lit() 
-           | atom_lit()
+           | sym_lit()
            | str_lit()
            | ident()
            | type_param()
@@ -36,7 +36,7 @@
 %% Literals.
 -type int_lit()   :: {int_lit, meta(), integer()}.
 -type float_lit() :: {float_lit, meta(), float()}.
--type atom_lit()  :: {atom_lit, meta(), atom()}.
+-type sym_lit()   :: {sym_lit, meta(), atom()}.
 -type str_lit()   :: {str_lit, meta(), binary()}.
 
 %% Names and operators.
@@ -65,7 +65,7 @@
 meta({source, Meta, _})     -> Meta;
 meta({int_lit, Meta, _})    -> Meta;
 meta({float_lit, Meta, _})  -> Meta;
-meta({atom_lit, Meta, _})   -> Meta;
+meta({sym_lit, Meta, _})    -> Meta;
 meta({str_lit, Meta, _})    -> Meta;
 meta({ident, Meta, _})      -> Meta;
 meta({type_param, Meta, _}) -> Meta;

src/aero_codegen.erl

@@ -128,8 +128,8 @@ gen_expr({c_int, _, Integer}) ->
   cerl:abstract(Integer);
 gen_expr({c_float, _, Float}) ->
   cerl:abstract(Float);
-gen_expr({c_atom, _, Atom}) ->
-  cerl:abstract(Atom);
+gen_expr({c_sym, _, Symbol}) ->
+  cerl:abstract(Symbol);
 gen_expr({c_str, _, String}) ->
   cerl:abstract(String);
 
@@ -215,8 +215,8 @@ gen_pat({c_pat_int, _, Integer}) ->
   cerl:abstract(Integer);
 gen_pat({c_pat_float, _, Float}) ->
   cerl:abstract(Float);
-gen_pat({c_pat_atom, _, Atom}) ->
-  cerl:abstract(Atom);
+gen_pat({c_pat_sym, _, Symbol}) ->
+  cerl:abstract(Symbol);
 gen_pat({c_pat_str, _, String}) ->
   cerl:abstract(String);
 

src/aero_core.erl

@@ -11,26 +11,26 @@
 -module(aero_core).
 
 -export([c_pkg/3, c_mod/4, c_def_func/4, c_def_const/5, c_def_mod/3]).
--export([c_block/2, c_bool/2, c_int/2, c_float/2, c_atom/2, c_str/2, c_unit/1, c_tuple/2,
+-export([c_block/2, c_bool/2, c_int/2, c_float/2, c_sym/2, c_str/2, c_unit/1, c_tuple/2,
          c_cons/3, c_nil/1, c_dict/2, c_func/5, c_call/3, c_apply/3, c_var/2, c_path/2, c_let/4,
          c_letrec/4, c_match/3, c_args/2]).
--export([c_pat_bool/2, c_pat_int/2, c_pat_float/2, c_pat_atom/2, c_pat_str/2, c_pat_unit/1,
+-export([c_pat_bool/2, c_pat_int/2, c_pat_float/2, c_pat_sym/2, c_pat_str/2, c_pat_unit/1,
          c_pat_tuple/2, c_pat_cons/3, c_pat_nil/1, c_pat_dict/2, c_pat_var/2, c_pat_args/2]).
--export([c_type_bool/1, c_type_int/1, c_type_float/1, c_type_atom/1, c_type_str/1, c_type_bytes/1,
+-export([c_type_bool/1, c_type_int/1, c_type_float/1, c_type_sym/1, c_type_str/1, c_type_bytes/1,
          c_type_bits/1, c_type_ref/1, c_type_unit/1, c_type_tuple/2, c_type_list/2, c_type_dict/3,
          c_type_func/3, c_type_uniq/2, c_type_dyn/2, c_type_any/1, c_type_never/1, c_type_wld/1,
          c_type_mbox/2, c_type_addr/2, c_type_var/2, c_type_path/2, c_type_tag/2, c_type_struct/3,
          c_type_proto/3, c_type_union/2, c_type_inter/2, c_type_where/3]).
 
 -export_type([c_any/0]).
 -export_type([c_pkg/0, c_mod/0, c_def/0, c_def_func/0, c_def_const/0, c_def_mod/0, c_vis/0]).
--export_type([c_expr/0, c_block/0, c_bool/0, c_int/0, c_float/0, c_atom/0, c_str/0, c_unit/0,
+-export_type([c_expr/0, c_block/0, c_bool/0, c_int/0, c_float/0, c_sym/0, c_str/0, c_unit/0,
               c_tuple/0, c_cons/0, c_nil/0,  c_dict/0, c_func/0, c_call/0, c_apply/0, c_var/0,
               c_path/0, c_let/0, c_letrec/0, c_match/0, c_args/0]).
--export_type([c_pat/0, c_pat_bool/0, c_pat_int/0, c_pat_float/0, c_pat_atom/0, c_pat_str/0,
+-export_type([c_pat/0, c_pat_bool/0, c_pat_int/0, c_pat_float/0, c_pat_sym/0, c_pat_str/0,
               c_pat_unit/0, c_pat_tuple/0, c_pat_cons/0, c_pat_nil/0, c_pat_dict/0, c_pat_var/0,
               c_pat_args/0]).
--export_type([c_type/0, c_type_bool/0, c_type_int/0, c_type_float/0, c_type_atom/0, c_type_str/0,
+-export_type([c_type/0, c_type_bool/0, c_type_int/0, c_type_float/0, c_type_sym/0, c_type_str/0,
               c_type_bytes/0, c_type_bits/0, c_type_ref/0, c_type_unit/0, c_type_tuple/0,
               c_type_list/0, c_type_dict/0, c_type_func/0, c_type_uniq/0, c_type_dyn/0,
               c_type_any/0, c_type_never/0, c_type_wld/0, c_type_mbox/0, c_type_addr/0,
@@ -54,7 +54,7 @@
 
 %% Modules.
 -type c_mod()       :: {c_mod, meta(), c_path(), c_mod_attrs(), [c_def()]}.
--type c_mod_attrs() :: [{c_atom(), c_expr()}].
+-type c_mod_attrs() :: [{c_sym(), c_expr()}].
 
 %% Definitions.
 -type c_def() :: c_def_func()
@@ -74,7 +74,7 @@
                 | c_bool()
                 | c_int()
                 | c_float()
-                | c_atom()
+                | c_sym()
                 | c_str()
                 | c_unit()
                 | c_tuple()
@@ -98,7 +98,7 @@
 -type c_bool()  :: {c_bool, meta(), boolean()}.
 -type c_int()   :: {c_int, meta(), integer()}.
 -type c_float() :: {c_float, meta(), float()}.
--type c_atom()  :: {c_atom, meta(), atom()}.
+-type c_sym()   :: {c_sym, meta(), atom()}.
 -type c_str()   :: {c_str, meta(), binary()}.
 
 %% Unit value.
@@ -152,7 +152,7 @@
 -type c_pat() :: c_pat_bool()
                | c_pat_int()
                | c_pat_float()
-               | c_pat_atom()
+               | c_pat_sym()
                | c_pat_str()
                | c_pat_unit()
                | c_pat_tuple()
@@ -166,7 +166,7 @@
 -type c_pat_bool()  :: {c_pat_bool, meta(), boolean()}.
 -type c_pat_int()   :: {c_pat_int, meta(), integer()}.
 -type c_pat_float() :: {c_pat_float, meta(), float()}.
--type c_pat_atom()  :: {c_pat_atom, meta(), atom()}.
+-type c_pat_sym()   :: {c_pat_sym, meta(), atom()}.
 -type c_pat_str()   :: {c_pat_str, meta(), binary()}.
 
 %% Unit pattern.
@@ -188,7 +188,7 @@
 -type c_type() :: c_type_bool()
                 | c_type_int()
                 | c_type_float()
-                | c_type_atom()
+                | c_type_sym()
                 | c_type_str()
                 | c_type_bytes()
                 | c_type_bits()
@@ -217,7 +217,7 @@
 -type c_type_bool()  :: {c_type_bool, meta()}.
 -type c_type_int()   :: {c_type_int, meta()}.
 -type c_type_float() :: {c_type_float, meta()}.
--type c_type_atom()  :: {c_type_atom, meta()}.
+-type c_type_sym()   :: {c_type_sym, meta()}.
 -type c_type_str()   :: {c_type_str, meta()}.
 
 %% Bytes and bits types.
@@ -320,9 +320,9 @@ c_float(Meta, Float) ->
   {c_float, Meta, Float}.
 
 %% Create an atom expression.
--spec c_atom(meta(), atom()) -> c_atom().
-c_atom(Meta, Atom) ->
-  {c_atom, Meta, Atom}.
+-spec c_sym(meta(), atom()) -> c_sym().
+c_sym(Meta, Symbol) ->
+  {c_sym, Meta, Symbol}.
 
 %% Create a string expression.
 -spec c_str(meta(), binary()) -> c_str().
@@ -415,9 +415,9 @@ c_pat_float(Meta, Float) ->
   {c_pat_float, Meta, Float}.
 
 %% Create an atom pattern.
--spec c_pat_atom(meta(), atom()) -> c_pat_atom().
-c_pat_atom(Meta, Atom) ->
-  {c_pat_atom, Meta, Atom}.
+-spec c_pat_sym(meta(), atom()) -> c_pat_sym().
+c_pat_sym(Meta, Symbol) ->
+  {c_pat_sym, Meta, Symbol}.
 
 %% Create a string pattern.
 -spec c_pat_str(meta(), binary()) -> c_pat_str().
@@ -475,9 +475,9 @@ c_type_float(Meta) ->
   {c_type_float, Meta}.
 
 %% Create an atom type.
--spec c_type_atom(meta()) -> c_type_atom().
-c_type_atom(Meta) ->
-  {c_type_atom, Meta}.
+-spec c_type_sym(meta()) -> c_type_sym().
+c_type_sym(Meta) ->
+  {c_type_sym, Meta}.
 
 %% Create a string type.
 -spec c_type_str(meta()) -> c_type_str().

src/aero_core_pprint.erl

@@ -48,8 +48,8 @@ pprint({c_int, _, Integer}, _Level) ->
   integer_to_list(Integer);
 pprint({c_float, _, Float}, _Level) ->
   float_to_list(Float);
-pprint({c_atom, _, Atom}, _Level) ->
-  [$:, printable_atom(Atom)];
+pprint({c_sym, _, Symbol}, _Level) ->
+  [$:, printable_symbol(Symbol)];
 pprint({c_str, _, String}, _Level) ->
   [$", printable_string(String), $"];
 
@@ -80,10 +80,10 @@ pprint({c_apply, _, Callee, Args}, Level) ->
   format([apply, Callee | pprint_args(arg, Args, Level)], Level);
 
 pprint({c_var, _, Name}, _Level) ->
-  [$%, printable_atom(Name)];
+  [$%, printable_symbol(Name)];
 
 pprint({c_path, _, Vars}, _Level) ->
-  [$$ | lists:join("::", [printable_atom(Name) || {c_var, _, Name} <- Vars])];
+  [$$ | lists:join("::", [printable_symbol(Name) || {c_var, _, Name} <- Vars])];
 
 pprint({c_let, _, Left, Type, Right}, Level) ->
   format(['let', Left, Type, Right], Level);
@@ -109,8 +109,8 @@ pprint({c_pat_int, _, Integer}, _Level) ->
   integer_to_list(Integer);
 pprint({c_pat_float, _, Float}, _Level) ->
   float_to_list(Float);
-pprint({c_pat_atom, _, Atom}, _Level) ->
-  [$:, printable_atom(Atom)];
+pprint({c_pat_sym, _, Symbol}, _Level) ->
+  [$:, printable_symbol(Symbol)];
 pprint({c_pat_str, _, String}, _Level) ->
   [$", printable_string(String), $"];
 
@@ -130,7 +130,7 @@ pprint({c_pat_dict, _, Pairs}, Level) ->
   format([dict, PairStrs], Level);
 
 pprint({c_pat_var, _, Name}, _Level) ->
-  [$%, printable_atom(Name)];
+  [$%, printable_symbol(Name)];
 
 %% Types.
 
@@ -140,7 +140,7 @@ pprint({c_type_int, _}, _Level) ->
   "int";
 pprint({c_type_float, _}, _Level) ->
   "float";
-pprint({c_type_atom, _}, _Level) ->
+pprint({c_type_sym, _}, _Level) ->
   "atom";
 pprint({c_type_str, _}, _Level) ->
   "str";
@@ -177,11 +177,11 @@ pprint({c_type_addr, _, T}, Level) ->
   format([addr, T], Level);
 
 pprint({c_type_var, _, Name}, _Level) ->
-  [$', printable_atom(Name)];
+  [$', printable_symbol(Name)];
 pprint({c_type_path, _, TypeVars}, _Level) ->
-  [$$ | lists:join("::", [printable_atom(Name) || {c_type_var, _, Name} <- TypeVars])];
+  [$$ | lists:join("::", [printable_symbol(Name) || {c_type_var, _, Name} <- TypeVars])];
 pprint({c_type_tag, _, Name}, _Level) ->
-  [$:, printable_atom(Name)];
+  [$:, printable_symbol(Name)];
 
 pprint({c_type_struct, _, Path, TArgs}, Level) ->
   format([struct, Path | pprint_args(arg, TArgs, Level)], Level);
@@ -232,24 +232,24 @@ format_inner(Nodes, Level) ->
 spaces(Level) ->
   lists:duplicate(Level, $\s).
 
-printable_atom(Atom) ->
-  Str = atom_to_list(Atom),
-  case lists:all(fun unquoted_atom_char/1, Str) of
+printable_symbol(Symbol) ->
+  Str = atom_to_list(Symbol),
+  case lists:all(fun unquoted_symbol_char/1, Str) of
     true  -> Str;
     false -> [$\", printable_string(Str), $\"]
   end.
 
-%% Core Aero atoms also allow "-" and "." where Aero ones do not and can start
+%% Core Aero symbols also allow "-" and "." where Aero ones do not and can start
 %% with a number as well.
-unquoted_atom_char($_) ->
+unquoted_symbol_char($_) ->
   true;
-unquoted_atom_char($-) ->
+unquoted_symbol_char($-) ->
   true;
-unquoted_atom_char($.) ->
+unquoted_symbol_char($.) ->
   true;
-unquoted_atom_char(C) when C >= $a, C =< $z; C >= $A, C =< $Z; C >= $0, C =< $9 ->
+unquoted_symbol_char(C) when C >= $a, C =< $z; C >= $A, C =< $Z; C >= $0, C =< $9 ->
   true;
-unquoted_atom_char(_) ->
+unquoted_symbol_char(_) ->
   false.
 
 %% Convert to printable ASCII and escape characters.

src/aero_expand_expr.erl

@@ -102,8 +102,8 @@ expand_expr({int_lit, _, Integer}, _Env) ->
   aero_core:c_int([], Integer);
 expand_expr({float_lit, _, Float}, _Env) ->
   aero_core:c_float([], Float);
-expand_expr({atom_lit, _, Atom}, _Env) ->
-  aero_core:c_atom([], Atom);
+expand_expr({sym_lit, _, Symbol}, _Env) ->
+  aero_core:c_sym([], Symbol);
 expand_expr({str_lit, _, String}, _Env) ->
   aero_core:c_str([], String);
 
@@ -132,7 +132,7 @@ expand_expr({expand, _, {op, _, '#{_}'}, [{args, _, Args}]}, Env) ->
         % We can have a tag in a dictionary for #{ atom: expr } syntax.
         % Needing to corece the left side into an atom.
         {tag, _, {ident, _, Key}, Value} ->
-          {aero_core:c_atom([], Key), expand_expr(Value, Env)}
+          {aero_core:c_sym([], Key), expand_expr(Value, Env)}
       end
     end, Args),
   aero_core:c_dict([], Pairs);
@@ -388,10 +388,10 @@ expand_expr({expand, Meta, {ident, _, 'if'}, [Cond, Next]}, Env) ->
     {block, _, _} = Then ->
       Cases = [
         {aero_core:c_pat_bool([], true), aero_core:c_tuple([], [
-          aero_core:c_atom([], some),
+          aero_core:c_sym([], some),
           expand_expr(Then, Env)
         ])},
-        {aero_env:wildcard_pat_var(Env), aero_core:c_atom([], none)}
+        {aero_env:wildcard_pat_var(Env), aero_core:c_sym([], none)}
       ],
       aero_core:c_match([], expand_expr(Cond, Env), Cases);
 
@@ -405,7 +405,7 @@ expand_expr({expand, Meta, {ident, _, 'if'}, _}, _Env) ->
 %% Logs.
 expand_expr({expand, _, {ident, _, log}, [Message]}, Env) ->
   Args = [
-    aero_core:c_atom([], standard_io),
+    aero_core:c_sym([], standard_io),
     aero_core:c_cons([],
       expand_expr(Message, Env),
       aero_core:c_cons([],

src/aero_expand_pat.erl

@@ -40,8 +40,8 @@ expand_pat_inner({int_lit, _, Integer}, Env) ->
   {aero_core:c_pat_int([], Integer), Env};
 expand_pat_inner({float_lit, _, Float}, Env) ->
   {aero_core:c_pat_float([], Float), Env};
-expand_pat_inner({atom_lit, _, Atom}, Env) ->
-  {aero_core:c_pat_atom([], Atom), Env};
+expand_pat_inner({sym_lit, _, Symbol}, Env) ->
+  {aero_core:c_pat_sym([], Symbol), Env};
 expand_pat_inner({str_lit, _, String}, Env) ->
   {aero_core:c_pat_str([], String), Env};
 
@@ -82,7 +82,7 @@ expand_pat_inner({expand, _, {op, _, '#{_}'}, [{args, _, Args}]}, Env) ->
         % We can have a tag in a dictionary pattern for #{ atom: pat } syntax.
         % Needing to corece the left side into an atom.
         {tag, _, {ident, _, Key}, Value} ->
-          KeyPat = aero_core:c_pat_atom([], Key),
+          KeyPat = aero_core:c_pat_sym([], Key),
           {ValuePat, ValueEnv} = expand_pat_inner(Value, AccEnv),
 
           {[{KeyPat, ValuePat} | Acc], ValueEnv}

src/aero_expand_type.erl

@@ -19,7 +19,7 @@ expand_type({ident, _, int}, Env) ->
 expand_type({ident, _, float}, Env) ->
   {aero_core:c_type_float([]), Env};
 expand_type({ident, _, atom}, Env) ->
-  {aero_core:c_type_atom([]), Env};
+  {aero_core:c_type_sym([]), Env};
 expand_type({ident, _, str}, Env) ->
   {aero_core:c_type_str([]), Env};
 expand_type({ident, _, bytes}, Env) ->

src/aero_lift.erl

@@ -189,7 +189,7 @@ is_simple(Expr) ->
 is_literal({c_bool, _, _})  -> true;
 is_literal({c_int, _, _})   -> true;
 is_literal({c_float, _, _}) -> true;
-is_literal({c_atom, _, _})  -> true;
+is_literal({c_sym, _, _})  -> true;
 is_literal({c_str, _, _})   -> true;
 is_literal({c_nil, _})      -> true;
 is_literal({c_unit, _})     -> true;

src/aero_parse.erl

@@ -227,8 +227,8 @@ expr_single({type_param, Meta, TypeParam}, _Mode) ->
   {type_param, Meta, TypeParam};
 expr_single({blank, Meta}, _Mode) ->
   {blank, Meta};
-expr_single({atom_lit, Meta, Atom}, _Mode) ->
-  {atom_lit, Meta, Atom};
+expr_single({sym_lit, Meta, Symbol}, _Mode) ->
+  {sym_lit, Meta, Symbol};
 expr_single({str_lit, Meta, String}, _Mode) ->
   {str_lit, Meta, String};
 expr_single({int_lit, Meta, Integer}, _Mode) ->