From 5a2c12d6b26bd5f2c7e0ab75b44749acf1b788e0 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 13 Feb 2017 10:33:13 +0100
Subject: erts: Correct the documentation of abstract end-of-file

The L in {eof, L} is not an annotation (LINE), but a location.
---
 erts/doc/src/absform.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'erts')

diff --git a/erts/doc/src/absform.xml b/erts/doc/src/absform.xml
index fe8e3b30e7..ec00955ccd 100644
--- a/erts/doc/src/absform.xml
+++ b/erts/doc/src/absform.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2016</year>
+      <year>2001</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -182,10 +182,18 @@
         can contain the following:</p>
 
       <list type="bulleted">
-        <item>Tuples <c>{error,E}</c> and <c>{warning,W}</c>, denoting
-          syntactically incorrect forms and warnings</item>
-        <item><c>{eof,LINE}</c>, denoting an end-of-stream
-          encountered before a complete form had been parsed</item>
+        <item>
+          <p>Tuples <c>{error,E}</c> and <c>{warning,W}</c>, denoting
+            syntactically incorrect forms and warnings.
+          </p>
+        </item>
+        <item>
+          <p><c>{eof,LOCATION}</c>, denoting an end-of-stream
+            encountered before a complete form had been parsed.
+            The word <c>LOCATION</c> represents an integer, and denotes the
+            number of the last line in the source file.
+          </p>
+        </item>
       </list>
     </section>
   </section>
-- 
cgit v1.2.3


From 97164e67aa45f099ca28213586f2aed781f48ae4 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Mon, 13 Feb 2017 15:48:23 +0100
Subject: erts: Fix handling of locations and annotations

---
 erts/preloaded/src/init.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts')

diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 86dc9a2957..3dc6953b4c 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -1084,7 +1084,7 @@ start_it({eval,Bin}) ->
     {ok,Ts,_} = erl_scan:string(Str),
     Ts1 = case reverse(Ts) of
 	      [{dot,_}|_] -> Ts;
-	      TsR -> reverse([{dot,1} | TsR])
+	      TsR -> reverse([{dot,erl_anno:new(1)} | TsR])
 	  end,
     {ok,Expr} = erl_parse:parse_exprs(Ts1),
     {value, _Value, _Bs} = erl_eval:exprs(Expr, erl_eval:new_bindings()),
-- 
cgit v1.2.3


From 3f6de229ccd0c34aeea550fc1f16ffc4e6536073 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Fri, 17 Feb 2017 12:59:41 +0100
Subject: Update preloaded

---
 erts/preloaded/ebin/init.beam | Bin 49996 -> 50096 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'erts')

diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index fdd87ef739..92eedd73d8 100644
Binary files a/erts/preloaded/ebin/init.beam and b/erts/preloaded/ebin/init.beam differ
-- 
cgit v1.2.3