diff options
author | Björn-Egil Dahlberg <[email protected]> | 2014-03-20 13:57:33 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2014-03-20 13:57:33 +0100 |
commit | 73af231f1a22083031df49ba19fdfd4f6b434a10 (patch) | |
tree | a44b82f1d2c26d1dae38aad7aba27b0a70df08c0 /lib/compiler/src/core_parse.hrl | |
parent | 4e982a63474d1ab92544662d34a75a8303733fbe (diff) | |
parent | 8432d74ba21a4ca627bead1a4607ded4a0c25d35 (diff) | |
download | otp-73af231f1a22083031df49ba19fdfd4f6b434a10.tar.gz otp-73af231f1a22083031df49ba19fdfd4f6b434a10.tar.bz2 otp-73af231f1a22083031df49ba19fdfd4f6b434a10.zip |
Merge branch 'ks/cerl-type-fixes'
* ks/cerl-type-fixes:
Restore the alphabetical order of Core Erlang records
Clean up the types of cerl
Diffstat (limited to 'lib/compiler/src/core_parse.hrl')
-rw-r--r-- | lib/compiler/src/core_parse.hrl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/compiler/src/core_parse.hrl b/lib/compiler/src/core_parse.hrl index 20f3a46991..4a00535360 100644 --- a/lib/compiler/src/core_parse.hrl +++ b/lib/compiler/src/core_parse.hrl @@ -34,7 +34,7 @@ -record(c_apply, {anno=[], op, % op :: Tree, args}). % args :: [Tree] --record(c_binary, {anno=[], segments}). % segments :: [#c_bitstr{}] +-record(c_binary, {anno=[], segments :: [cerl:c_bitstr()]}). -record(c_bitstr, {anno=[], val, % val :: Tree, size, % size :: Tree, @@ -70,6 +70,15 @@ -record(c_literal, {anno=[], val}). % val :: literal() +-record(c_map, {anno=[], + arg=#c_literal{val=#{}} :: cerl:c_var() | cerl:c_literal(), + es :: [cerl:c_map_pair()]}). + +-record(c_map_pair, {anno=[], + op :: #c_literal{val::'assoc'} | #c_literal{val::'exact'}, + key, + val}). + -record(c_module, {anno=[], name, % name :: Tree, exports, % exports :: [Tree], attrs, % attrs :: [#c_def{}], @@ -96,12 +105,3 @@ -record(c_values, {anno=[], es}). % es :: [Tree] -record(c_var, {anno=[], name :: cerl:var_name()}). - --record(c_map_pair, {anno=[], - op :: #c_literal{val::'assoc'} | #c_literal{val::'exact'}, - key, - val}). - --record(c_map, {anno=[], - arg=#c_literal{val=#{}} :: #c_var{} | #c_literal{}, - es :: [#c_map_pair{}]}). |