Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 145 insertions, 32 deletions

diff --git a/lib/compiler/src/core_parse.yrl b/lib/compiler/src/core_parse.yrl
index 4e98a8c2da..8028aa99bb 100644
--- a/lib/compiler/src/core_parse.yrl
+++ b/lib/compiler/src/core_parse.yrl
@@ -1,18 +1,19 @@
 %% -*-Erlang-*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -21,6 +22,8 @@
 %% Have explicit productions for annotated phrases named anno_XXX.
 %% This just does an XXX and adds the annotation.
 
+Expect 0.
+
 Nonterminals
 
 module_definition module_export module_attribute module_defs
@@ -44,9 +47,14 @@ receive_expr timeout try_expr
 sequence catch_expr
 variable clause clause_pattern
 
-annotation anno_fun anno_expression anno_expressions
+map_expr anno_map_expr map_pairs anno_map_pair map_pair map_pair_assoc map_pair_exact
+map_pattern map_pair_patterns map_pair_pattern
+
+annotation anno_atom anno_fun anno_expression anno_expressions
 anno_variable anno_variables anno_pattern anno_patterns
 anno_function_name
+anno_literal
+anno_segment anno_segment_pattern
 anno_clause anno_clauses.
 
 Terminals
@@ -54,6 +62,7 @@ Terminals
 %% Separators
 
 '(' ')' '{' '}' '[' ']' '|' ',' '->' '=' '/' '<' '>' ':' '-|' '#'
+'~' '=>' ':='
 
 %% Keywords (atoms are assumed to always be single-quoted).
 
@@ -83,7 +92,7 @@ module_definition ->
 module_definition ->
     '(' 'module' atom module_export module_attribute module_defs 'end'
 	'-|' annotation ')' :
-	#c_module{anno='$9',name=tok_val('$3'),exports='$4',
+        #c_module{anno='$9',name=#c_literal{val=tok_val('$3')},exports='$4',
 		  attrs='$5',defs='$6'}.
 
 module_export -> '[' ']' : [].
@@ -92,7 +101,7 @@ module_export -> '[' exported_names ']' : '$2'.
 exported_names -> exported_name ',' exported_names : ['$1' | '$3'].
 exported_names -> exported_name : ['$1'].
 
-exported_name -> function_name : '$1'.
+exported_name -> anno_function_name : '$1'.
 
 module_attribute -> 'attributes' '[' ']' : [].
 module_attribute -> 'attributes' '[' attribute_list ']' : '$3'.
@@ -100,8 +109,16 @@ module_attribute -> 'attributes' '[' attribute_list ']' : '$3'.
 attribute_list -> attribute ',' attribute_list : ['$1' | '$3'].
 attribute_list -> attribute : ['$1'].
 
-attribute -> atom '=' literal :
-	{#c_literal{val=tok_val('$1')},'$3'}.
+attribute -> anno_atom '=' anno_literal :
+	{'$1','$3'}.
+
+anno_atom -> atom :
+         cerl:c_atom(tok_val('$1')).
+anno_atom -> '(' atom '-|' annotation ')' :
+         cerl:ann_c_atom('$4', tok_val('$2')).
+
+anno_literal -> literal : '$1'.
+anno_literal -> '(' literal '-|' annotation ')' : cerl:set_ann('$2', '$4').
 
 module_defs -> function_definitions : '$1'.
 
@@ -118,7 +135,7 @@ function_definition ->
 	{'$1','$3'}.
 
 anno_fun -> '(' fun_expr '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 anno_fun -> fun_expr : '$1'.
 
 %% Constant terms for annotations and attributes.
@@ -157,7 +174,7 @@ tail_constant -> ',' constant tail_constant : ['$2'|'$3'].
 %%  ( ( V -| <anno> ) = ( {a} -| <anno> ) -| <anno> )
 
 anno_pattern -> '(' other_pattern '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 anno_pattern -> other_pattern : '$1'.
 anno_pattern -> anno_variable : '$1'.
 
@@ -166,6 +183,7 @@ anno_patterns -> anno_pattern : ['$1'].
 
 other_pattern -> atomic_pattern : '$1'.
 other_pattern -> tuple_pattern : '$1'.
+other_pattern -> map_pattern : '$1'.
 other_pattern -> cons_pattern : '$1'.
 other_pattern -> binary_pattern : '$1'.
 other_pattern -> anno_variable '=' anno_pattern :
@@ -176,21 +194,41 @@ atomic_pattern -> atomic_literal : '$1'.
 tuple_pattern -> '{' '}' : c_tuple([]).
 tuple_pattern -> '{' anno_patterns '}' : c_tuple('$2').
 
+map_pattern -> '~' '{' '}' '~' : c_map_pattern([]).
+map_pattern -> '~' '{' map_pair_patterns '}' '~' :
+		   c_map_pattern('$3').
+map_pattern -> '~' '{' map_pair_patterns '|' anno_map_expr '}' '~' :
+		   ann_c_map_pattern('$5', '$3').
+
+map_pair_patterns -> map_pair_pattern : ['$1'].
+map_pair_patterns -> map_pair_pattern ',' map_pair_patterns : ['$1' | '$3'].
+
+map_pair_pattern -> anno_expression ':=' anno_pattern :
+			#c_map_pair{op=#c_literal{val=exact},
+				    key='$1',val='$3'}.
+map_pair_pattern -> '(' anno_expression ':=' anno_pattern '-|' annotation ')' :
+			#c_map_pair{anno='$6',op=#c_literal{val=exact},
+				    key='$2',val='$4'}.
+
 cons_pattern -> '[' anno_pattern tail_pattern :
-		    #c_cons{hd='$2',tl='$3'}.
+		    c_cons('$2', '$3').
 
 tail_pattern -> ']' : #c_literal{val=[]}.
 tail_pattern -> '|' anno_pattern ']' : '$2'.
 tail_pattern -> ',' anno_pattern tail_pattern :
-		    #c_cons{hd='$2',tl='$3'}.
+		    c_cons('$2', '$3').
 
 binary_pattern -> '#' '{' '}' '#' : #c_binary{segments=[]}.
 binary_pattern -> '#' '{' segment_patterns '}' '#' : #c_binary{segments='$3'}.
 
-segment_patterns -> segment_pattern ',' segment_patterns : ['$1' | '$3'].
-segment_patterns -> segment_pattern : ['$1'].
+segment_patterns -> anno_segment_pattern ',' segment_patterns : ['$1' | '$3'].
+segment_patterns -> anno_segment_pattern : ['$1'].
 
-segment_pattern -> '#' '<' anno_pattern '>' '(' anno_patterns ')':
+anno_segment_pattern -> segment_pattern : '$1'.
+anno_segment_pattern -> '(' segment_pattern '-|' annotation ')' :
+      cerl:set_ann('$2', '$4').
+
+segment_pattern -> '#' '<' anno_pattern '>' '(' anno_expressions ')':
 	case '$6' of
 	    [S,U,T,Fs] ->
 		#c_bitstr{val='$3',size=S,unit=U,type=T,flags=Fs};
@@ -206,7 +244,7 @@ anno_variables -> anno_variable : ['$1'].
 
 anno_variable -> variable : '$1'.
 anno_variable -> '(' variable '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 
 %% Expressions
 %%  Must split expressions into two levels as nested value expressions
@@ -214,7 +252,7 @@ anno_variable -> '(' variable '-|' annotation ')' :
 
 anno_expression -> expression : '$1'.
 anno_expression -> '(' expression '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 
 anno_expressions -> anno_expression ',' anno_expressions : ['$1' | '$3'].
 anno_expressions -> anno_expression : ['$1'].
@@ -240,6 +278,7 @@ single_expression -> primop_expr : '$1'.
 single_expression -> try_expr : '$1'.
 single_expression -> sequence : '$1'.
 single_expression -> catch_expr : '$1'.
+single_expression -> map_expr : '$1'.
 
 literal -> atomic_literal : '$1'.
 literal -> tuple_literal : '$1'.
@@ -262,11 +301,33 @@ cons_literal -> '[' literal tail_literal : c_cons('$2', '$3').
 
 tail_literal -> ']' : #c_literal{val=[]}.
 tail_literal -> '|' literal ']' : '$2'.
-tail_literal -> ',' literal tail_literal : #c_cons{hd='$2',tl='$3'}.
+tail_literal -> ',' literal tail_literal : c_cons('$2', '$3').
 
 tuple -> '{' '}' : c_tuple([]).
 tuple -> '{' anno_expressions '}' : c_tuple('$2').
 
+map_expr -> '~' '{' '}' '~' : c_map([]).
+map_expr -> '~' '{' map_pairs '}' '~' : c_map('$3').
+map_expr -> '~' '{' map_pairs '|' anno_variable '}' '~' : ann_c_map([], '$5', '$3').
+map_expr -> '~' '{' map_pairs '|' anno_map_expr '}' '~' : ann_c_map([], '$5', '$3').
+
+anno_map_expr -> map_expr : '$1'.
+anno_map_expr -> '(' map_expr '-|' annotation ')' : cerl:set_ann('$2', '$4').
+
+map_pairs -> anno_map_pair : ['$1'].
+map_pairs -> anno_map_pair ',' map_pairs : ['$1' | '$3'].
+
+anno_map_pair -> map_pair : '$1'.
+anno_map_pair -> '(' map_pair '-|' annotation ')' : cerl:set_ann('$2', '$4').
+
+map_pair -> map_pair_assoc : '$1'.
+map_pair -> map_pair_exact : '$1'.
+
+map_pair_assoc -> anno_expression '=>' anno_expression :
+		#c_map_pair{op=#c_literal{val=assoc},key='$1',val='$3'}.
+map_pair_exact -> anno_expression ':=' anno_expression :
+		#c_map_pair{op=#c_literal{val=exact},key='$1',val='$3'}.
+
 cons -> '[' anno_expression tail : c_cons('$2', '$3').
 
 tail -> ']' : #c_literal{val=[]}.
@@ -274,10 +335,13 @@ tail -> '|' anno_expression ']' : '$2'.
 tail -> ',' anno_expression tail : c_cons('$2', '$3').
 
 binary -> '#' '{' '}' '#' : #c_literal{val = <<>>}.
-binary -> '#' '{' segments '}' '#' : #c_binary{segments='$3'}.
+binary -> '#' '{' segments '}' '#' : make_binary('$3').
+
+segments -> anno_segment ',' segments : ['$1' | '$3'].
+segments -> anno_segment : ['$1'].
 
-segments -> segment ',' segments : ['$1' | '$3'].
-segments -> segment : ['$1'].
+anno_segment -> segment : '$1'.
+anno_segment -> '(' segment '-|' annotation ')' : cerl:set_ann('$2', '$4').
 
 segment -> '#' '<' anno_expression '>' '(' anno_expressions ')':
 	case '$6' of
@@ -293,7 +357,7 @@ function_name -> atom '/' integer :
 
 anno_function_name -> function_name : '$1'.
 anno_function_name -> '(' function_name '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 
 let_vars -> anno_variable : ['$1'].
 let_vars -> '<' '>' : [].
@@ -321,7 +385,7 @@ anno_clauses -> anno_clause : ['$1'].
 
 anno_clause -> clause : '$1'.
 anno_clause -> '(' clause '-|' annotation ')' :
-	core_lib:set_anno('$2', '$4').
+	cerl:set_ann('$2', '$4').
 
 clause -> clause_pattern 'when' anno_expression '->' anno_expression :
 	#c_clause{pats='$1',guard='$3',body='$5'}.
@@ -377,7 +441,56 @@ Erlang code.
 
 -include("core_parse.hrl").
 
--import(cerl, [c_cons/2,c_tuple/1]).
+-import(cerl, [ann_c_map/3,ann_c_map_pattern/2,c_cons/2,c_map/1,
+	       c_map_pattern/1,c_tuple/1]).
 
 tok_val(T) -> element(3, T).
 tok_line(T) -> element(2, T).
+
+%% make_binary([#c_bitstr{}]) -> #c_binary{} | #c_literal{}
+%%  Create either #c_binary{} or #c_literal{} from the binary segments.
+%%  In certain contexts, such as keys for maps, only literals and
+%%  variables are allowed, so we must not create a #c_binary{}
+%%  record in those situation.
+%%
+%%  To keep this function simple, we use a crude heuristic. We will
+%%  assume that Core Erlang has been produced by core_pp. If the
+%%  segments *could* have been output from a literal binary by
+%%  core_pp, we will create a #c_literal{}. Otherwise we will create a
+%%  #c_binary{} record.
+
+make_binary(Segs) ->
+    try make_lit_bin(<<>>, Segs) of
+	Bs when is_bitstring(Bs) ->
+	    #c_literal{val=Bs}
+    catch
+	throw:impossible ->
+	    #c_binary{segments=Segs}
+    end.
+
+make_lit_bin(Acc, [#c_bitstr{val=I0,size=Sz0,unit=U0,type=Type0,flags=F0}|T]) ->
+    I = get_lit_val(I0),
+    Sz = get_lit_val(Sz0),
+    U = get_lit_val(U0),
+    Type = get_lit_val(Type0),
+    F = get_lit_val(F0),
+    if
+	is_integer(I), U =:= 1, Type =:= integer, F =:= [unsigned,big] ->
+	    ok;
+	true ->
+	    throw(impossible)
+    end,
+    if
+	Sz =< 8, T =:= [] ->
+	    <<Acc/binary,I:Sz>>;
+	Sz =:= 8 ->
+	    make_lit_bin(<<Acc/binary,I:8>>, T);
+	true ->
+	    throw(impossible)
+    end;
+make_lit_bin(Acc, []) -> Acc.
+
+get_lit_val(#c_literal{val=Val}) -> Val;
+get_lit_val(_) -> throw(impossible).
+
+%% vim: syntax=erlang