Merge branch 'maint'

* maint:
  Document erl_parse:abstract/2

3 files changed, 36 insertions, 3 deletions

diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index bafc2e0746..56a7131821 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -167,6 +167,23 @@
         <p>Converts the Erlang data structure <c><anno>Data</anno></c> into an
           abstract form of type <c><anno>AbsTerm</anno></c>.
           This is the inverse of <c>normalise/1</c>.</p>
+        <p><c>erl_parse:abstract(T)</c> is equivalent to
+          <c>erl_parse:abstract(T, 0)</c>.</p>
+      </desc>
+    </func>
+    <func>
+      <name name="abstract" arity="2"/>
+      <fsummary>Convert an Erlang term into an abstract form</fsummary>
+      <desc>
+        <p>Converts the Erlang data structure <c><anno>Data</anno></c> into an
+          abstract form of type <c><anno>AbsTerm</anno></c>.</p>
+        <p>The <c><anno>Line</anno></c> option is the line that will
+          be assigned to each node of the abstract form.</p>
+        <p>The <c><anno>Encoding</anno></c> option is used for
+          selecting which integer lists will be considered
+          as strings. The default is to use the encoding returned by
+          <seealso marker="epp#default_encoding/0">
+          <c>epp:default_encoding/0</c></seealso></p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 9ff25fcbc5..7145b0858f 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -887,6 +887,7 @@ abstract(T, Options) when is_list(Options) ->
     abstract(T, Line, Encoding).
 
 -define(UNICODE(C),
+        is_integer(C) andalso
          (C >= 0 andalso C < 16#D800 orelse
           C > 16#DFFF andalso C < 16#FFFE orelse
           C > 16#FFFF andalso C =< 16#10FFFF)).
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 7e33166c6a..361abbb771 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -22,7 +22,7 @@
 	 init_per_group/2,end_per_group/2]).
 
 -export([ error_1/1, error_2/1, iso88591/1, otp_7810/1, otp_10302/1,
-          otp_10990/1]).
+          otp_10990/1, otp_10992/1]).
 
 -import(lists, [nth/2,flatten/1]).
 -import(io_lib, [print/1]).
@@ -61,7 +61,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [{group, error}, iso88591, otp_7810, otp_10302, otp_10990].
+    [{group, error}, iso88591, otp_7810, otp_10302, otp_10990, otp_10992].
 
 groups() -> 
     [{error, [], [error_1, error_2]}].
@@ -1130,6 +1130,21 @@ otp_10990(Config) when is_list(Config) ->
     {'EXIT',_} = (catch {foo, erl_scan:string([$",42.0,$"],1)}),
     ok.
 
+otp_10992(doc) ->
+    "OTP-10992. List of floats to abstract format.";
+otp_10992(suite) ->
+    [];
+otp_10992(Config) when is_list(Config) ->
+    {cons,0,{float,0,42.0},{nil,0}} =
+        erl_parse:abstract([42.0], [{encoding,unicode}]),
+    {cons,0,{float,0,42.0},{nil,0}} =
+        erl_parse:abstract([42.0], [{encoding,utf8}]),
+    {cons,0,{integer,0,65},{cons,0,{float,0,42.0},{nil,0}}} =
+        erl_parse:abstract([$A,42.0], [{encoding,unicode}]),
+    {cons,0,{integer,0,65},{cons,0,{float,0,42.0},{nil,0}}} =
+        erl_parse:abstract([$A,42.0], [{encoding,utf8}]),
+    ok.
+
 test_string(String, Expected) ->
     {ok, Expected, _End} = erl_scan:string(String),
     test(String).