Merge branch 'richcarl/eliminate_lib_module/PR-1786/OTP-15072'

* richcarl/eliminate_lib_module/PR-1786/OTP-15072:
  Fix minor issues
  Eliminate call to ct:get_progname() in ts_erl_config
  Use \n escape instead of integer 10
  Move error formatting to erl_error.erl and delete lib.erl
  Move extended parse functions in lib.erl to erl_eval.erl
  Move lib:eval_str/1 into mod_esi.erl
  Remove lib:progname/0
  Eliminate call to lib:progname/1 in slave.erl
  Add ct:get_progname/0
  Remove lib:error_message/2
  Remove lib:flush_receive/0
  Remove lib:send/2 and lib:sendw/2
  Move lib:nonl/1 into yecc.erl

37 files changed, 411 insertions, 487 deletions

diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index afd8741cd1..3d35ae4f54 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -572,6 +572,16 @@
     </func>
 
     <func>
+      <name>get_progname() -&gt; string()</name>
+      <fsummary>Returns the command used to start this Erlang instance.</fsummary>
+      <desc><marker id="get_progname-0"/>
+        <p>Returns the command used to start this Erlang instance.
+           If this information could not be found, the string
+           <c>"no_prog_name"</c> is returned.</p>
+      </desc>
+    </func>
+
+    <func>
       <name>get_status() -&gt; TestStatus | {error, Reason} | no_tests_running</name>
       <fsummary>Returns status of ongoing test.</fsummary>
       <type>
diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index fd7fa07b81..14a9ec07cf 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -87,6 +87,7 @@
 	 decrypt_config_file/2, decrypt_config_file/3]).
 
 -export([get_target_name/1]).
+-export([get_progname/0]).
 -export([parse_table/1, listenv/1]).
 
 -export([remaining_test_procs/0]).
@@ -975,7 +976,20 @@ make_priv_dir() ->
 %%% belongs to.
 get_target_name(Handle) ->
     ct_util:get_target_name(Handle).
-    
+
+%%%-----------------------------------------------------------------
+%%% @doc Return the command used to start (this) erlang
+
+-spec get_progname() -> string().
+
+get_progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
+
 %%%-----------------------------------------------------------------
 %%% @spec parse_table(Data) -> {Heading,Table}
 %%%       Data = [string()]
@@ -1006,7 +1020,6 @@ parse_table(Data) ->
 listenv(Telnet) ->
     ct_util:listenv(Telnet).
 
-
 %%%-----------------------------------------------------------------
 %%% @spec testcases(TestDir, Suite) -> Testcases | {error,Reason}
 %%%       TestDir = string()
diff --git a/lib/common_test/src/test_server_ctrl.erl b/lib/common_test/src/test_server_ctrl.erl
index 1ae6c8c7c7..67645cac08 100644
--- a/lib/common_test/src/test_server_ctrl.erl
+++ b/lib/common_test/src/test_server_ctrl.erl
@@ -4382,7 +4382,7 @@ do_format_exception(Reason={Error,Stack}) ->
     PF = fun(Term, I) ->
 		 io_lib:format("~." ++ integer_to_list(I) ++ "tp", [Term])
 	 end,
-    case catch lib:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
+    case catch erl_error:format_exception(1, error, Error, Stack, StackFun, PF, utf8) of
 	{'EXIT',_R} ->
 	    {"~tp",Reason};
 	Formatted  ->
diff --git a/lib/common_test/src/test_server_node.erl b/lib/common_test/src/test_server_node.erl
index b2d4f199c3..76588e6887 100644
--- a/lib/common_test/src/test_server_node.erl
+++ b/lib/common_test/src/test_server_node.erl
@@ -591,7 +591,7 @@ cast_to_list(X) -> lists:flatten(io_lib:format("~tw", [X])).
 %%%  this
 %%%
 pick_erl_program(default) ->
-    cast_to_list(lib:progname());
+    ct:get_progname();
 pick_erl_program(L) ->
     P = random_element(L),
     case P of
@@ -600,7 +600,7 @@ pick_erl_program(L) ->
 	{release, S} ->
 	    find_release(S);
 	this ->
-	    cast_to_list(lib:progname())
+	    ct:get_progname()
     end.
 
 %% This is an attempt to distinguish between spaces in the program
@@ -611,8 +611,8 @@ pick_erl_program(L) ->
 %% ({prog,String}) or if the -program switch to beam is used and
 %% includes arguments (typically done by cerl in OTP test environment
 %% in order to ensure that slave/peer nodes are started with the same
-%% emulator and flags as the test node. The return from lib:progname()
-%% could then typically be '/<full_path_to>/cerl -gcov').
+%% emulator and flags as the test node. The return from ct:get_progname()
+%% could then typically be "/<full_path_to>/cerl -gcov").
 quote_progname(Progname) ->
     do_quote_progname(string:lexemes(Progname," ")).
 
diff --git a/lib/common_test/test_server/ts_erl_config.erl b/lib/common_test/test_server/ts_erl_config.erl
index c7fe4ccf83..e37fa844bb 100644
--- a/lib/common_test/test_server/ts_erl_config.erl
+++ b/lib/common_test/test_server/ts_erl_config.erl
@@ -358,7 +358,15 @@ link_library(_LibName,_Other) ->
 %% Returns emulator specific variables.
 emu_vars(Vars) ->
     [{is_source_build, is_source_build()},
-     {erl_name, atom_to_list(lib:progname())}|Vars].
+     {erl_name, get_progname()}|Vars].
+
+get_progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
 
 is_source_build() ->
     string:find(erlang:system_info(system_version), "source") =/= nomatch.
diff --git a/lib/common_test/test_server/ts_run.erl b/lib/common_test/test_server/ts_run.erl
index 3f594236bc..5dbbaca916 100644
--- a/lib/common_test/test_server/ts_run.erl
+++ b/lib/common_test/test_server/ts_run.erl
@@ -199,7 +199,7 @@ make_command(Vars, Spec, State) ->
     TestPath = filename:nativename(TestDir),
     Erl = case os:getenv("TS_RUN_VALGRIND") of
 	      false ->
-		  atom_to_list(lib:progname());
+		  ct:get_progname();
 	      _ ->
 		  case State#state.file of
 		      Dir when is_list(Dir) ->
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index c6a0056a70..a37b2064b2 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -295,7 +295,7 @@ format_error_reason({Reason, Stack}) when is_list(Stack) ->
     end,
     FormatFun = fun (Term, _) -> io_lib:format("~tp", [Term]) end,
     [io_lib:format("~tp", [Reason]),"\n\n",
-     lib:format_stacktrace(1, Stack, StackFun, FormatFun)];
+     erl_error:format_stacktrace(1, Stack, StackFun, FormatFun)];
 format_error_reason(Reason) ->
     io_lib:format("~tp", [Reason]).
 
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index 4cd3dce670..55cbada53b 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -467,7 +467,7 @@ mark_break(Cm, LineNo, Le) ->
 
 parse_cmd(Cmd, LineNo) ->
     {ok,Tokens,_} = erl_scan:string(Cmd, LineNo, [text]),
-    {ok,Forms,Bs} = lib:extended_parse_exprs(Tokens),
+    {ok,Forms,Bs} = erl_eval:extended_parse_exprs(Tokens),
     {Forms, Bs}.
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_wx_win.erl b/lib/debugger/src/dbg_wx_win.erl
index f1298154ab..fea94156c1 100644
--- a/lib/debugger/src/dbg_wx_win.erl
+++ b/lib/debugger/src/dbg_wx_win.erl
@@ -275,7 +275,7 @@ entry(Parent, Title, Prompt, {Type, Value}) ->
 verify(Type, Str) ->
     case erl_scan:string(Str, 1, [text]) of
 	{ok, Tokens, _EndLine} when Type==term ->
-	    case lib:extended_parse_term(Tokens++[{dot, erl_anno:new(1)}]) of
+	    case erl_eval:extended_parse_term(Tokens++[{dot, erl_anno:new(1)}]) of
 		{ok, Value} -> {edit, Value};
 		_Error -> 
 		    ignore
diff --git a/lib/dialyzer/test/options1_SUITE_data/results/compiler b/lib/dialyzer/test/options1_SUITE_data/results/compiler
index cbb5115c91..e1dc038800 100644
--- a/lib/dialyzer/test/options1_SUITE_data/results/compiler
+++ b/lib/dialyzer/test/options1_SUITE_data/results/compiler
@@ -28,7 +28,7 @@ cerl_inline.erl:2750: The pattern <{[], L, D}, Vs> can never match the type <[1.
 cerl_inline.erl:2752: The pattern <{[], _L, D}, Vs> can never match the type <[1..255,...],[any()]>
 cerl_inline.erl:2754: The pattern <{F, L, D}, Vs> can never match the type <[1..255,...],[any()]>
 cerl_inline.erl:2756: The pattern <{F, _L, D}, Vs> can never match the type <[1..255,...],[any()]>
-compile.erl:788: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
+compile.erl:792: The pattern {'error', Es} can never match the type {'ok',<<_:64,_:_*8>>}
 core_lint.erl:473: The pattern <{'c_atom', _, 'all'}, 'binary', _Def, St> can never match the type <_,#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}},tl::#c_nil{} | {'c_atom' | 'c_char' | 'c_float' | 'c_int' | 'c_string' | 'c_tuple',_,_} | #c_cons{hd::{_,_} | {_,_,_} | {_,_,_,_},tl::{_,_} | {_,_,_} | {_,_,_,_}}},[any()],_>
 core_lint.erl:505: The pattern <_Req, 'unknown', St> can never match the type <non_neg_integer(),non_neg_integer(),_>
 sys_pre_expand.erl:625: Call to missing or unexported function erlang:hash/2
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
index 7e5ccde2fd..6838cf6734 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
@@ -228,11 +228,15 @@ os_process_size() ->
     case os:type() of
 	{unix, sunos} ->
 	    Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-	    list_to_integer(lib:nonl(Size));
+	    list_to_integer(nonl(Size));
 	_ ->
 	    0
     end.
 
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 run_tc({Name,Fun}, St) ->
     Before0 = statistics(runtime),
     Val = (catch Fun(St)),
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
index a48f73274b..ce144e061f 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_esi.erl
@@ -285,7 +285,7 @@ eval(Info,"GET",CGIBody,Modules) ->
 	    "~n   Modules: ~p",[Modules]),
     case auth(CGIBody,Modules) of
 	true ->
-	    case lib:eval_str(string:concat(CGIBody,". ")) of
+	    case eval_str(string:concat(CGIBody,". ")) of
 		{error,Reason} ->
 		    ?vlog("eval -> error:"
 			  "~n   Reason: ~p",[Reason]),
@@ -318,6 +318,48 @@ auth(CGIBody,Modules) ->
 	    false
     end.
 
+%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'}
+%%   InStr must represent a body
+%%   Note: If InStr is a binary it has to be a Latin-1 string.
+%%   If you have a UTF-8 encoded binary you have to call
+%%   unicode:characters_to_list/1 before the call to eval_str().
+
+-define(result(F,D), lists:flatten(io_lib:format(F, D))).
+
+-spec eval_str(string() | unicode:latin1_binary()) ->
+                      {'ok', string()} | {'error', string()}.
+
+eval_str(Str) when is_list(Str) ->
+    case erl_scan:tokens([], Str, 0) of
+	{more, _} ->
+	    {error, "Incomplete form (missing .<cr>)??"};
+	{done, {ok, Toks, _}, Rest} ->
+	    case all_white(Rest) of
+		true ->
+		    case erl_parse:parse_exprs(Toks) of
+			{ok, Exprs} ->
+			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
+				{value, Val, _} ->
+				    {ok, Val};
+				Other ->
+				    {error, ?result("*** eval: ~p", [Other])}
+			    end;
+			{error, {_Line, Mod, Args}} ->
+                            Msg = ?result("*** ~ts",[Mod:format_error(Args)]),
+                            {error, Msg}
+		    end;
+		false ->
+		    {error, ?result("Non-white space found after "
+				    "end-of-form :~ts", [Rest])}
+		end
+    end.
+
+all_white([$\s|T]) -> all_white(T);
+all_white([$\n|T]) -> all_white(T);
+all_white([$\t|T]) -> all_white(T);
+all_white([])      -> true;
+all_white(_)       -> false.
+
 %%----------------------------------------------------------------------
 %%Creates the environment list that will be the first arg to the
 %%Functions that is called through the ErlScript Schema
diff --git a/lib/hipe/main/hipe.erl b/lib/hipe/main/hipe.erl
index 97814fe217..5e6a60326d 100644
--- a/lib/hipe/main/hipe.erl
+++ b/lib/hipe/main/hipe.erl
@@ -852,8 +852,8 @@ finalize_fun_sequential({MFA, Icode}, Opts, Servers) ->
 print_crash_message(What, Error, StackTrace) ->
   StackFun = fun(_,_,_) -> false end,
   FormatFun = fun (Term, _) -> io_lib:format("~p", [Term]) end,
-  StackTrace = lib:format_stacktrace(1, StackTrace,
-				     StackFun, FormatFun),
+  StackTrace = erl_error:format_stacktrace(1, StackTrace,
+                                           StackFun, FormatFun),
   WhatS = case What of
 	    {M,F,A} -> io_lib:format("~w:~w/~w", [M,F,A]);
 	    Mod -> io_lib:format("~w", [Mod])
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 3206d957d9..b49b3a7093 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -561,7 +561,7 @@ eval(#mod{method = Method} = ModData, ESIBody, Modules)
     end.
 
 generate_webpage(ESIBody) ->
-    (catch lib:eval_str(string:concat(ESIBody,". "))).
+    (catch eval_str(string:concat(ESIBody,". "))).
 
 is_authorized(_ESIBody, [all]) ->
     true;
@@ -573,3 +573,45 @@ is_authorized(ESIBody, Modules) ->
 	nomatch ->
 	    false
     end.
+
+%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'}
+%%   InStr must represent a body
+%%   Note: If InStr is a binary it has to be a Latin-1 string.
+%%   If you have a UTF-8 encoded binary you have to call
+%%   unicode:characters_to_list/1 before the call to eval_str().
+
+-define(result(F,D), lists:flatten(io_lib:format(F, D))).
+
+-spec eval_str(string()) ->
+                      {'ok', string()} | {'error', string()}.
+
+eval_str(Str) when is_list(Str) ->
+    case erl_scan:tokens([], Str, 0) of
+	{more, _} ->
+	    {error, "Incomplete form (missing .<cr>)??"};
+	{done, {ok, Toks, _}, Rest} ->
+	    case all_white(Rest) of
+		true ->
+		    case erl_parse:parse_exprs(Toks) of
+			{ok, Exprs} ->
+			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
+				{value, Val, _} ->
+				    {ok, Val};
+				Other ->
+				    {error, ?result("*** eval: ~p", [Other])}
+			    end;
+			{error, {_Line, Mod, Args}} ->
+                            Msg = ?result("*** ~ts",[Mod:format_error(Args)]),
+                            {error, Msg}
+		    end;
+		false ->
+		    {error, ?result("Non-white space found after "
+				    "end-of-form :~ts", [Rest])}
+		end
+    end.
+
+all_white([$\s|T]) -> all_white(T);
+all_white([$\n|T]) -> all_white(T);
+all_white([$\t|T]) -> all_white(T);
+all_white([])      -> true;
+all_white(_)       -> false.
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index 0470f09f29..9c6712ad74 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -244,7 +244,7 @@ illegal(Name) ->
 test_node(Name) ->
     test_node(Name, false).
 test_node(Name, Illigal) ->
-    ProgName = atom_to_list(lib:progname()),
+    ProgName = ct:get_progname(),
     Command = ProgName ++ " -noinput " ++ long_or_short() ++ Name ++
         " -eval \"net_adm:ping('" ++ atom_to_list(node()) ++ "')\"" ++
         case Illigal of
diff --git a/lib/kernel/test/heart_SUITE.erl b/lib/kernel/test/heart_SUITE.erl
index 22db24de5f..e95635b800 100644
--- a/lib/kernel/test/heart_SUITE.erl
+++ b/lib/kernel/test/heart_SUITE.erl
@@ -168,7 +168,7 @@ reboot(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
 
     ok = rpc:call(Node, heart, set_cmd,
-			[atom_to_list(lib:progname()) ++ 
+			[ct:get_progname() ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
     rpc:call(Node, init, reboot, []),
     receive
@@ -203,7 +203,7 @@ node_start_immediately_after_crash_test(Config) when is_list(Config) ->
 			     [{"ERL_CRASH_DUMP_SECONDS", "0"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
-	[atom_to_list(lib:progname()) ++
+	[ct:get_progname() ++
 	    " -noshell -heart " ++ name(Node) ++ "&"]),
 
     Mod  = exhaust_atoms,
@@ -254,7 +254,7 @@ node_start_soon_after_crash_test(Config) when is_list(Config) ->
 			     [{"ERL_CRASH_DUMP_SECONDS", "10"}]),
 
     ok = rpc:call(Node, heart, set_cmd,
-	[atom_to_list(lib:progname()) ++
+	[ct:get_progname() ++
 	    " -noshell -heart " ++ name(Node) ++ "&"]),
 
     Mod  = exhaust_atoms,
@@ -309,7 +309,7 @@ set_cmd(Config) when is_list(Config) ->
 clear_cmd(Config) when is_list(Config) ->
     {ok, Node} = start_check(slave, ?UNIQ_NODE_NAME),
     ok = rpc:call(Node, heart, set_cmd,
-			[atom_to_list(lib:progname()) ++
+			[ct:get_progname() ++
 			 " -noshell -heart " ++ name(Node) ++ "&"]),
     rpc:call(Node, init, reboot, []),
     receive
diff --git a/lib/kernel/test/kernel_config_SUITE.erl b/lib/kernel/test/kernel_config_SUITE.erl
index 9a4578917d..a21020ff97 100644
--- a/lib/kernel/test/kernel_config_SUITE.erl
+++ b/lib/kernel/test/kernel_config_SUITE.erl
@@ -76,7 +76,7 @@ sync(Conf) when is_list(Conf) ->
     %% Reset wall_clock
     {T1,_} = erlang:statistics(wall_clock),
     io:format("~p~n", [{t1, T1}]),
-    Command = lists:concat([lib:progname(),
+    Command = lists:append([ct:get_progname(),
 			    " -detached -sname cp1 ",
 			    "-config ", Config,
 			    " -env ERL_CRASH_DUMP erl_crash_dump.cp1"]),
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 591fbb2125..abbc301360 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -227,8 +227,8 @@ find_executable(Config) when is_list(Config) ->
 	    DataDir = proplists:get_value(data_dir, Config),
 
 	    %% Smoke test.
-	    case lib:progname() of
-		erl ->
+	    case ct:get_progname() of
+		"erl" ->
 		    ErlPath = os:find_executable("erl"),
 		    true = is_list(ErlPath),
 		    true = filelib:is_regular(ErlPath);
@@ -388,7 +388,7 @@ comp(Expected, Got) ->
 	    ct:fail(failed)
     end.
 
-%% Like lib:nonl/1, but strips \r as well as \n.
+%% strips \n and \r\n from end of string
 
 strip_nl([$\r, $\n]) -> [];
 strip_nl([$\n])      -> [];
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 0678b64134..718ef91942 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -682,7 +682,7 @@ parse_string(Str) ->
 		     {error, {_SLine, SMod, SError}, _} ->
 			 throw(io_lib:format("~ts", [SMod:format_error(SError)]))
 		 end,
-	case lib:extended_parse_term(Tokens) of
+	case erl_eval:extended_parse_term(Tokens) of
 	    {error, {_PLine, PMod, PError}} ->
 		throw(io_lib:format("~ts", [PMod:format_error(PError)]));
 	    Res -> Res
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index b4e1cfe5e3..ce1b9468fd 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -455,10 +455,14 @@ os_process_size() ->
     case os:type() of
         {unix, sunos} ->
             Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-            list_to_integer(lib:nonl(Size));
+            list_to_integer(nonl(Size));
         _ ->
             0
-    end.            
+    end.
+
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
 
 timeit(Name, Fun, St0) ->
     Time = runtime,
diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile
index 508a4fa2de..5c6b714f80 100644
--- a/lib/stdlib/doc/src/Makefile
+++ b/lib/stdlib/doc/src/Makefile
@@ -71,7 +71,6 @@ XML_REF3_FILES = \
 	gen_statem.xml \
 	io.xml \
 	io_lib.xml \
-	lib.xml \
 	lists.xml \
 	log_mf_h.xml \
 	maps.xml \
diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml
deleted file mode 100644
index 58dad7c9e0..0000000000
--- a/lib/stdlib/doc/src/lib.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year><year>2016</year>
-      <holder>Ericsson AB. All Rights Reserved.</holder>
-    </copyright>
-    <legalnotice>
-      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.
-    
-    </legalnotice>
-
-    <title>lib</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>lib</module>
-  <modulesummary>Useful library functions.</modulesummary>
-  <description>
-    <warning>
-      <p>This module is retained for backward compatibility. It can disappear
-        without warning in a future Erlang/OTP release.</p>
-    </warning>
-  </description>
-
-  <funcs>
-    <func>
-      <name name="error_message" arity="2"/>
-      <fsummary>Print error message.</fsummary>
-      <desc>
-        <p>Prints error message <c><anno>Args</anno></c> in accordance with
-          <c><anno>Format</anno></c>. Similar to
-          <seealso marker="io#format/1"><c>io:format/2</c></seealso>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="flush_receive" arity="0"/>
-      <fsummary>Flush messages.</fsummary>
-      <desc>
-        <p>Flushes the message buffer of the current process.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="nonl" arity="1"/>
-      <fsummary>Remove last newline.</fsummary>
-      <desc>
-        <p>Removes the last newline character, if any, in
-          <c><anno>String1</anno></c>.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="progname" arity="0"/>
-      <fsummary>Return name of Erlang start script.</fsummary>
-      <desc>
-        <p>Returns the name of the script that started the current
-          Erlang session.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="send" arity="2"/>
-      <fsummary>Send a message.</fsummary>
-      <desc>
-        <p>Makes it possible to send a message using the <c>apply/3</c> BIF.</p>
-      </desc>
-    </func>
-
-    <func>
-      <name name="sendw" arity="2"/>
-      <fsummary>Send a message and wait for an answer.</fsummary>
-      <desc>
-        <p>As <seealso marker="#send/2"><c>send/2</c></seealso>,
-          but waits for an answer. It is implemented as follows:</p>
-        <code type="none">
-sendw(To, Msg) ->
-    To ! {self(),Msg},
-    receive
-        Reply -> Reply
-    end.</code>
-        <p>The returned message is not necessarily a reply to the sent
-          message.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml
index 68bfddbc71..c6f30d272d 100644
--- a/lib/stdlib/doc/src/ref_man.xml
+++ b/lib/stdlib/doc/src/ref_man.xml
@@ -66,7 +66,6 @@
   <xi:include href="gen_statem.xml"/>
   <xi:include href="io.xml"/>
   <xi:include href="io_lib.xml"/>
-  <xi:include href="lib.xml"/>
   <xi:include href="lists.xml"/>
   <xi:include href="log_mf_h.xml"/>
   <xi:include href="maps.xml"/>
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
index d559adf9b6..fd2d625685 100644
--- a/lib/stdlib/doc/src/specs.xml
+++ b/lib/stdlib/doc/src/specs.xml
@@ -33,7 +33,6 @@
   <xi:include href="../specs/specs_gen_statem.xml"/>
   <xi:include href="../specs/specs_io.xml"/>
   <xi:include href="../specs/specs_io_lib.xml"/>
-  <xi:include href="../specs/specs_lib.xml"/>
   <xi:include href="../specs/specs_lists.xml"/>
   <xi:include href="../specs/specs_log_mf_h.xml"/>
   <xi:include href="../specs/specs_maps.xml"/>
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index dc3735055a..dfe6bf3e68 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -62,6 +62,7 @@ MODULES= \
 	erl_anno \
 	erl_bits \
 	erl_compile \
+	erl_error \
 	erl_eval \
 	erl_expand_records \
 	erl_internal \
@@ -91,7 +92,6 @@ MODULES= \
 	io_lib_format \
 	io_lib_fread \
 	io_lib_pretty \
-	lib \
 	lists \
 	log_mf_h \
 	maps \
@@ -176,6 +176,7 @@ docs:
 primary_bootstrap_compiler: \
   $(BOOTSTRAP_COMPILER)/ebin/epp.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_anno.beam \
+  $(BOOTSTRAP_COMPILER)/ebin/erl_error.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_scan.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_parse.beam \
   $(BOOTSTRAP_COMPILER)/ebin/erl_lint.beam \
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/erl_error.erl
index 51e0c3f77e..fdcb9e824c 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/erl_error.erl
@@ -17,337 +17,12 @@
 %% 
 %% %CopyrightEnd%
 %%
--module(lib).
-
--export([flush_receive/0, error_message/2, progname/0, nonl/1, send/2,
-	 sendw/2, eval_str/1]).
-
--export([extended_parse_exprs/1, extended_parse_term/1,
-         subst_values_for_vars/2]).
+-module(erl_error).
 
 -export([format_exception/6, format_exception/7,
          format_stacktrace/4, format_stacktrace/5,
          format_call/4, format_call/5, format_fun/1, format_fun/2]).
 
--spec flush_receive() -> 'ok'.
-
-flush_receive() ->
-    receive
-	_Any ->
-	    flush_receive()
-    after
-	0 ->
-	    ok
-    end.
-
-%%
-%% Functions for doing standard system format i/o.
-%%
--spec error_message(Format, Args) -> 'ok' when
-      Format :: io:format(),
-      Args :: [term()].
-
-error_message(Format, Args) ->
-    io:format(<<"** ~ts **\n">>, [io_lib:format(Format, Args)]).
-
-%% Return the name of the script that starts (this) erlang 
-%%
--spec progname() -> atom().
-
-progname() ->
-    case init:get_argument(progname) of
-	{ok, [[Prog]]} ->
-	    list_to_atom(Prog);
-	_Other ->
-	    no_prog_name
-    end.
-
--spec nonl(String1) -> String2 when
-      String1 :: string(),
-      String2 :: string().
-
-nonl([10]) -> [];
-nonl([]) -> [];
-nonl([H|T]) -> [H|nonl(T)].
-
--spec send(To, Msg) -> Msg when
-      To :: pid() | atom() | {atom(), node()},
-      Msg :: term().
-
-send(To, Msg) -> To ! Msg.
-
--spec sendw(To, Msg) -> term() when
-      To :: pid() | atom() | {atom(), node()},
-      Msg :: term().
-
-sendw(To, Msg) ->
-    To ! {self(), Msg},
-    receive 
-	Reply -> Reply
-    end.
-
-%% eval_str(InStr) -> {ok, OutStr} | {error, ErrStr'}
-%%   InStr must represent a body
-%%   Note: If InStr is a binary it has to be a Latin-1 string.
-%%   If you have a UTF-8 encoded binary you have to call
-%%   unicode:characters_to_list/1 before the call to eval_str().
-
--define(result(F,D), lists:flatten(io_lib:format(F, D))).
-
--spec eval_str(string() | unicode:latin1_binary()) ->
-                      {'ok', string()} | {'error', string()}.
-
-eval_str(Str) when is_list(Str) ->
-    case erl_scan:tokens([], Str, 0) of
-	{more, _} ->
-	    {error, "Incomplete form (missing .<cr>)??"};
-	{done, {ok, Toks, _}, Rest} ->
-	    case all_white(Rest) of
-		true ->
-		    case erl_parse:parse_exprs(Toks) of
-			{ok, Exprs} ->
-			    case catch erl_eval:exprs(Exprs, erl_eval:new_bindings()) of
-				{value, Val, _} ->
-				    {ok, Val};
-				Other ->
-				    {error, ?result("*** eval: ~p", [Other])}
-			    end;
-			{error, {_Line, Mod, Args}} ->
-                            Msg = ?result("*** ~ts",[Mod:format_error(Args)]),
-                            {error, Msg}
-		    end;
-		false ->
-		    {error, ?result("Non-white space found after "
-				    "end-of-form :~ts", [Rest])}
-		end
-    end;
-eval_str(Bin) when is_binary(Bin) ->
-    eval_str(binary_to_list(Bin)).
-
-all_white([$\s|T]) -> all_white(T);
-all_white([$\n|T]) -> all_white(T);
-all_white([$\t|T]) -> all_white(T);
-all_white([])      -> true;
-all_white(_)       -> false.
-
-%% `Tokens' is assumed to have been scanned with the 'text' option.
-%% The annotations of the returned expressions are locations.
-%%
-%% Can handle pids, ports, references, and external funs ("items").
-%% Known items are represented by variables in the erl_parse tree, and
-%% the items themselves are stored in the returned bindings.
-
--spec extended_parse_exprs(Tokens) ->
-                {'ok', ExprList, Bindings} | {'error', ErrorInfo} when
-      Tokens :: [erl_scan:token()],
-      ExprList :: [erl_parse:abstract_expr()],
-      Bindings :: erl_eval:binding_struct(),
-      ErrorInfo :: erl_parse:error_info().
-
-extended_parse_exprs(Tokens) ->
-    Ts = tokens_fixup(Tokens),
-    case erl_parse:parse_exprs(Ts) of
-        {ok, Exprs0} ->
-            {Exprs, Bs} = expr_fixup(Exprs0),
-            {ok, reset_expr_anno(Exprs), Bs};
-        _ErrorInfo ->
-            erl_parse:parse_exprs(reset_token_anno(Ts))
-    end.
-
-tokens_fixup([]) -> [];
-tokens_fixup([T|Ts]=Ts0) ->
-    try token_fixup(Ts0) of
-        {NewT, NewTs} ->
-            [NewT|tokens_fixup(NewTs)]
-    catch
-        _:_ ->
-            [T|tokens_fixup(Ts)]
-    end.
-
-token_fixup(Ts) ->
-    {AnnoL, NewTs, FixupTag} = unscannable(Ts),
-    String = lists:append([erl_anno:text(A) || A <- AnnoL]),
-    _ = (fixup_fun(FixupTag))(String),
-    NewAnno = erl_anno:set_text(fixup_text(FixupTag), hd(AnnoL)),
-    {{string, NewAnno, String}, NewTs}.
-
-unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
-             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7], Ts, function};
-unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
-             {'.', A5}, {atom, A6, _}, {'.', A7}, {integer, A8, _},
-             {'>', A9}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7, A8, A9], Ts, function};
-unscannable([{'<', A1}, {float, A2, _}, {'.', A3}, {integer, A4, _},
-             {'>', A5}|Ts]) ->
-    {[A1, A2, A3, A4, A5], Ts, pid};
-unscannable([{'#', A1}, {var, A2, 'Port'}, {'<', A3}, {float, A4, _},
-             {'>', A5}|Ts]) ->
-    {[A1, A2, A3, A4, A5], Ts, port};
-unscannable([{'#', A1}, {var, A2, 'Ref'}, {'<', A3}, {float, A4, _},
-             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
-    {[A1, A2, A3, A4, A5, A6, A7], Ts, reference}.
-
-expr_fixup(Expr0) ->
-    {Expr, Bs, _} = expr_fixup(Expr0, erl_eval:new_bindings(), 1),
-    {Expr, Bs}.
-
-expr_fixup({string,A,S}=T, Bs0, I) ->
-    try string_fixup(A, S) of
-        Value ->
-            Var = new_var(I),
-            Bs = erl_eval:add_binding(Var, Value, Bs0),
-            {{var, A, Var}, Bs, I+1}
-    catch
-        _:_ ->
-            {T, Bs0, I}
-    end;
-expr_fixup(Tuple, Bs0, I0) when is_tuple(Tuple) ->
-    {L, Bs, I} = expr_fixup(tuple_to_list(Tuple), Bs0, I0),
-    {list_to_tuple(L), Bs, I};
-expr_fixup([E0|Es0], Bs0, I0) ->
-    {E, Bs1, I1} = expr_fixup(E0, Bs0, I0),
-    {Es, Bs, I} = expr_fixup(Es0, Bs1, I1),
-    {[E|Es], Bs, I};
-expr_fixup(T, Bs, I) ->
-    {T, Bs, I}.
-
-string_fixup(A, S) ->
-    Text = erl_anno:text(A),
-    FixupTag = fixup_tag(Text, S),
-    (fixup_fun(FixupTag))(S).
-
-new_var(I) ->
-    list_to_atom(lists:concat(['__ExtendedParseExprs_', I, '__'])).
-
-reset_token_anno(Tokens) ->
-    [setelement(2, T, (reset_anno())(element(2, T))) || T <- Tokens].
-
-reset_expr_anno(Exprs) ->
-    [erl_parse:map_anno(reset_anno(), E) || E <- Exprs].
-
-reset_anno() ->
-    fun(A) -> erl_anno:new(erl_anno:location(A)) end.
-
-fixup_fun(function)  -> fun function/1;
-fixup_fun(pid)       -> fun erlang:list_to_pid/1;
-fixup_fun(port)      -> fun erlang:list_to_port/1;
-fixup_fun(reference) -> fun erlang:list_to_ref/1.
-
-function(S) ->
-    %% External function.
-    {ok, [_, _, _,
-          {atom, _, Module}, _,
-          {atom, _, Function}, _,
-          {integer, _, Arity}|_], _} = erl_scan:string(S),
-    erlang:make_fun(Module, Function, Arity).
-
-fixup_text(function)  -> "function";
-fixup_text(pid)       -> "pid";
-fixup_text(port)      -> "port";
-fixup_text(reference) -> "reference".
-
-fixup_tag("function",  "#"++_) -> function;
-fixup_tag("pid",       "<"++_) -> pid;
-fixup_tag("port",      "#"++_) -> port;
-fixup_tag("reference", "#"++_) -> reference.
-
-%%% End of extended_parse_exprs.
-
-%% `Tokens' is assumed to have been scanned with the 'text' option.
-%%
-%% Can handle pids, ports, references, and external funs.
-
--spec extended_parse_term(Tokens) ->
-                {'ok', Term} | {'error', ErrorInfo} when
-      Tokens :: [erl_scan:token()],
-      Term :: term(),
-      ErrorInfo :: erl_parse:error_info().
-
-extended_parse_term(Tokens) ->
-    case extended_parse_exprs(Tokens) of
-        {ok, [Expr], Bindings} ->
-            try normalise(Expr, Bindings) of
-                Term ->
-                    {ok, Term}
-            catch
-                _:_ ->
-                    Loc = erl_anno:location(element(2, Expr)),
-                    {error,{Loc,?MODULE,"bad term"}}
-            end;
-        {ok, [_,Expr|_], _Bindings} ->
-                Loc = erl_anno:location(element(2, Expr)),
-                {error,{Loc,?MODULE,"bad term"}};
-        {error, _} = Error ->
-            Error
-    end.
-
-%% From erl_parse.
-normalise({var, _, V}, Bs) ->
-    {value, Value} = erl_eval:binding(V, Bs),
-    Value;
-normalise({char,_,C}, _Bs) -> C;
-normalise({integer,_,I}, _Bs) -> I;
-normalise({float,_,F}, _Bs) -> F;
-normalise({atom,_,A}, _Bs) -> A;
-normalise({string,_,S}, _Bs) -> S;
-normalise({nil,_}, _Bs) -> [];
-normalise({bin,_,Fs}, Bs) ->
-    {value, B, _} =
-	eval_bits:expr_grp(Fs, [],
-			   fun(E, _) ->
-				   {value, normalise(E, Bs), []}
-			   end, [], true),
-    B;
-normalise({cons,_,Head,Tail}, Bs) ->
-    [normalise(Head, Bs)|normalise(Tail, Bs)];
-normalise({tuple,_,Args}, Bs) ->
-    list_to_tuple(normalise_list(Args, Bs));
-normalise({map,_,Pairs}, Bs) ->
-    maps:from_list(lists:map(fun
-		%% only allow '=>'
-		({map_field_assoc,_,K,V}) ->
-                                     {normalise(K, Bs),normalise(V, Bs)}
-	    end, Pairs));
-%% Special case for unary +/-.
-normalise({op,_,'+',{char,_,I}}, _Bs) -> I;
-normalise({op,_,'+',{integer,_,I}}, _Bs) -> I;
-normalise({op,_,'+',{float,_,F}}, _Bs) -> F;
-normalise({op,_,'-',{char,_,I}}, _Bs) -> -I;   %Weird, but compatible!
-normalise({op,_,'-',{integer,_,I}}, _Bs) -> -I;
-normalise({op,_,'-',{float,_,F}}, _Bs) -> -F;
-normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}, _Bs) ->
-    %% Since "#Fun<M.F.A>" is recognized, "fun M:F/A" should be too.
-    fun M:F/A.
-
-normalise_list([H|T], Bs) ->
-    [normalise(H, Bs)|normalise_list(T, Bs)];
-normalise_list([], _Bs) ->
-    [].
-
-%% To be used on ExprList and Bindings returned from extended_parse_exprs().
-%% Substitute {value, A, Item} for {var, A, ExtendedParseVar}.
-%% {value, A, Item} is a shell/erl_eval convention, and for example
-%% the linter cannot handle it.
-
--spec subst_values_for_vars(ExprList, Bindings) -> [term()] when
-      ExprList :: [erl_parse:abstract_expr()],
-      Bindings :: erl_eval:binding_struct().
-
-subst_values_for_vars({var, A, V}=Var, Bs) ->
-    case erl_eval:binding(V, Bs) of
-        {value, Value} ->
-            {value, A, Value};
-        unbound ->
-            Var
-    end;
-subst_values_for_vars(L, Bs) when is_list(L) ->
-    [subst_values_for_vars(E, Bs) || E <- L];
-subst_values_for_vars(T, Bs) when is_tuple(T) ->
-    list_to_tuple(subst_values_for_vars(tuple_to_list(T), Bs));
-subst_values_for_vars(T, _Bs) ->
-    T.
-
 %%% Formatting of exceptions, mfa:s and funs.
 
 %% -> iolist() (no \n at end)
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 4ee11383da..0f6d48b9a3 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -27,7 +27,8 @@
 -export([exprs/2,exprs/3,exprs/4,expr/2,expr/3,expr/4,expr/5,
          expr_list/2,expr_list/3,expr_list/4]).
 -export([new_bindings/0,bindings/1,binding/2,add_binding/3,del_binding/2]).
-
+-export([extended_parse_exprs/1, extended_parse_term/1,
+         subst_values_for_vars/2]).
 -export([is_constant_expr/1, partial_eval/1]).
 
 %% Is used by standalone Erlang (escript).
@@ -1286,6 +1287,224 @@ merge_bindings(Bs1, Bs2) ->
 %% 		  error -> Bs
 %% 	      end
 %%       end, Bs2, Bs1).
+
+%% Substitute {value, A, Item} for {var, A, Var}, preserving A.
+%% {value, A, Item} is a shell/erl_eval convention, and for example
+%% the linter cannot handle it.
+
+-spec subst_values_for_vars(ExprList, Bindings) -> [term()] when
+      ExprList :: [erl_parse:abstract_expr()],
+      Bindings :: binding_struct().
+
+subst_values_for_vars({var, A, V}=Var, Bs) ->
+    case erl_eval:binding(V, Bs) of
+        {value, Value} ->
+            {value, A, Value};
+        unbound ->
+            Var
+    end;
+subst_values_for_vars(L, Bs) when is_list(L) ->
+    [subst_values_for_vars(E, Bs) || E <- L];
+subst_values_for_vars(T, Bs) when is_tuple(T) ->
+    list_to_tuple(subst_values_for_vars(tuple_to_list(T), Bs));
+subst_values_for_vars(T, _Bs) ->
+    T.
+
+%% `Tokens' is assumed to have been scanned with the 'text' option.
+%% The annotations of the returned expressions are locations.
+%%
+%% Can handle pids, ports, references, and external funs ("items").
+%% Known items are represented by variables in the erl_parse tree, and
+%% the items themselves are stored in the returned bindings.
+
+-spec extended_parse_exprs(Tokens) ->
+                {'ok', ExprList, Bindings} | {'error', ErrorInfo} when
+      Tokens :: [erl_scan:token()],
+      ExprList :: [erl_parse:abstract_expr()],
+      Bindings :: erl_eval:binding_struct(),
+      ErrorInfo :: erl_parse:error_info().
+
+extended_parse_exprs(Tokens) ->
+    Ts = tokens_fixup(Tokens),
+    case erl_parse:parse_exprs(Ts) of
+        {ok, Exprs0} ->
+            {Exprs, Bs} = expr_fixup(Exprs0),
+            {ok, reset_expr_anno(Exprs), Bs};
+        _ErrorInfo ->
+            erl_parse:parse_exprs(reset_token_anno(Ts))
+    end.
+
+tokens_fixup([]) -> [];
+tokens_fixup([T|Ts]=Ts0) ->
+    try token_fixup(Ts0) of
+        {NewT, NewTs} ->
+            [NewT|tokens_fixup(NewTs)]
+    catch
+        _:_ ->
+            [T|tokens_fixup(Ts)]
+    end.
+
+token_fixup(Ts) ->
+    {AnnoL, NewTs, FixupTag} = unscannable(Ts),
+    String = lists:append([erl_anno:text(A) || A <- AnnoL]),
+    _ = (fixup_fun(FixupTag))(String),
+    NewAnno = erl_anno:set_text(fixup_text(FixupTag), hd(AnnoL)),
+    {{string, NewAnno, String}, NewTs}.
+
+unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
+             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7], Ts, function};
+unscannable([{'#', A1}, {var, A2, 'Fun'}, {'<', A3}, {atom, A4, _},
+             {'.', A5}, {atom, A6, _}, {'.', A7}, {integer, A8, _},
+             {'>', A9}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7, A8, A9], Ts, function};
+unscannable([{'<', A1}, {float, A2, _}, {'.', A3}, {integer, A4, _},
+             {'>', A5}|Ts]) ->
+    {[A1, A2, A3, A4, A5], Ts, pid};
+unscannable([{'#', A1}, {var, A2, 'Port'}, {'<', A3}, {float, A4, _},
+             {'>', A5}|Ts]) ->
+    {[A1, A2, A3, A4, A5], Ts, port};
+unscannable([{'#', A1}, {var, A2, 'Ref'}, {'<', A3}, {float, A4, _},
+             {'.', A5}, {float, A6, _}, {'>', A7}|Ts]) ->
+    {[A1, A2, A3, A4, A5, A6, A7], Ts, reference}.
+
+expr_fixup(Expr0) ->
+    {Expr, Bs, _} = expr_fixup(Expr0, erl_eval:new_bindings(), 1),
+    {Expr, Bs}.
+
+expr_fixup({string,A,S}=T, Bs0, I) ->
+    try string_fixup(A, S) of
+        Value ->
+            Var = new_var(I),
+            Bs = erl_eval:add_binding(Var, Value, Bs0),
+            {{var, A, Var}, Bs, I+1}
+    catch
+        _:_ ->
+            {T, Bs0, I}
+    end;
+expr_fixup(Tuple, Bs0, I0) when is_tuple(Tuple) ->
+    {L, Bs, I} = expr_fixup(tuple_to_list(Tuple), Bs0, I0),
+    {list_to_tuple(L), Bs, I};
+expr_fixup([E0|Es0], Bs0, I0) ->
+    {E, Bs1, I1} = expr_fixup(E0, Bs0, I0),
+    {Es, Bs, I} = expr_fixup(Es0, Bs1, I1),
+    {[E|Es], Bs, I};
+expr_fixup(T, Bs, I) ->
+    {T, Bs, I}.
+
+string_fixup(A, S) ->
+    Text = erl_anno:text(A),
+    FixupTag = fixup_tag(Text, S),
+    (fixup_fun(FixupTag))(S).
+
+new_var(I) ->
+    list_to_atom(lists:concat(['__ExtendedParseExprs_', I, '__'])).
+
+reset_token_anno(Tokens) ->
+    [setelement(2, T, (reset_anno())(element(2, T))) || T <- Tokens].
+
+reset_expr_anno(Exprs) ->
+    [erl_parse:map_anno(reset_anno(), E) || E <- Exprs].
+
+reset_anno() ->
+    fun(A) -> erl_anno:new(erl_anno:location(A)) end.
+
+fixup_fun(function)  -> fun function/1;
+fixup_fun(pid)       -> fun erlang:list_to_pid/1;
+fixup_fun(port)      -> fun erlang:list_to_port/1;
+fixup_fun(reference) -> fun erlang:list_to_ref/1.
+
+function(S) ->
+    %% External function.
+    {ok, [_, _, _,
+          {atom, _, Module}, _,
+          {atom, _, Function}, _,
+          {integer, _, Arity}|_], _} = erl_scan:string(S),
+    erlang:make_fun(Module, Function, Arity).
+
+fixup_text(function)  -> "function";
+fixup_text(pid)       -> "pid";
+fixup_text(port)      -> "port";
+fixup_text(reference) -> "reference".
+
+fixup_tag("function",  "#"++_) -> function;
+fixup_tag("pid",       "<"++_) -> pid;
+fixup_tag("port",      "#"++_) -> port;
+fixup_tag("reference", "#"++_) -> reference.
+
+%%% End of extended_parse_exprs.
+
+%% `Tokens' is assumed to have been scanned with the 'text' option.
+%%
+%% Can handle pids, ports, references, and external funs.
+
+-spec extended_parse_term(Tokens) ->
+                {'ok', Term} | {'error', ErrorInfo} when
+      Tokens :: [erl_scan:token()],
+      Term :: term(),
+      ErrorInfo :: erl_parse:error_info().
+
+extended_parse_term(Tokens) ->
+    case extended_parse_exprs(Tokens) of
+        {ok, [Expr], Bindings} ->
+            try normalise(Expr, Bindings) of
+                Term ->
+                    {ok, Term}
+            catch
+                _:_ ->
+                    Loc = erl_anno:location(element(2, Expr)),
+                    {error,{Loc,?MODULE,"bad term"}}
+            end;
+        {ok, [_,Expr|_], _Bindings} ->
+                Loc = erl_anno:location(element(2, Expr)),
+                {error,{Loc,?MODULE,"bad term"}};
+        {error, _} = Error ->
+            Error
+    end.
+
+%% From erl_parse.
+normalise({var, _, V}, Bs) ->
+    {value, Value} = erl_eval:binding(V, Bs),
+    Value;
+normalise({char,_,C}, _Bs) -> C;
+normalise({integer,_,I}, _Bs) -> I;
+normalise({float,_,F}, _Bs) -> F;
+normalise({atom,_,A}, _Bs) -> A;
+normalise({string,_,S}, _Bs) -> S;
+normalise({nil,_}, _Bs) -> [];
+normalise({bin,_,Fs}, Bs) ->
+    {value, B, _} =
+	eval_bits:expr_grp(Fs, [],
+			   fun(E, _) ->
+				   {value, normalise(E, Bs), []}
+			   end, [], true),
+    B;
+normalise({cons,_,Head,Tail}, Bs) ->
+    [normalise(Head, Bs)|normalise(Tail, Bs)];
+normalise({tuple,_,Args}, Bs) ->
+    list_to_tuple(normalise_list(Args, Bs));
+normalise({map,_,Pairs}, Bs) ->
+    maps:from_list(lists:map(fun
+		%% only allow '=>'
+		({map_field_assoc,_,K,V}) ->
+                                     {normalise(K, Bs),normalise(V, Bs)}
+	    end, Pairs));
+%% Special case for unary +/-.
+normalise({op,_,'+',{char,_,I}}, _Bs) -> I;
+normalise({op,_,'+',{integer,_,I}}, _Bs) -> I;
+normalise({op,_,'+',{float,_,F}}, _Bs) -> F;
+normalise({op,_,'-',{char,_,I}}, _Bs) -> -I;   %Weird, but compatible!
+normalise({op,_,'-',{integer,_,I}}, _Bs) -> -I;
+normalise({op,_,'-',{float,_,F}}, _Bs) -> -F;
+normalise({'fun',_,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}, _Bs) ->
+    %% Since "#Fun<M.F.A>" is recognized, "fun M:F/A" should be too.
+    fun M:F/A.
+
+normalise_list([H|T], Bs) ->
+    [normalise(H, Bs)|normalise_list(T, Bs)];
+normalise_list([], _Bs) ->
+    [].
+
 %%----------------------------------------------------------------------------
 %%
 %% Evaluate expressions:
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index beea9927d2..89a81684f5 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -882,7 +882,7 @@ format_exception(Class, Reason, StackTrace) ->
                  io_lib:format("~." ++ integer_to_list(I) ++ P, [Term, 50])
          end,
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
-    lib:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
+    erl_error:format_exception(1, Class, Reason, StackTrace, StackFun, PF, Enc).
 
 encoding() ->
     [{encoding, Encoding}] = enc(),
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 8d01840313..9094e0c0cd 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -841,8 +841,8 @@ format_exception(Class, Reason, StackTrace, {Enc,_}=Extra) ->
     StackFun = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
     %% EI = "    exception: ",
     EI = "    ",
-    [EI, lib:format_exception(1+length(EI), Class, Reason,
-                              StackTrace, StackFun, PF, Enc), "\n"].
+    [EI, erl_error:format_exception(1+length(EI), Class, Reason,
+                                    StackTrace, StackFun, PF, Enc), "\n"].
 
 to_string(A, latin1) ->
     io_lib:write_atom_as_latin1(A);
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 3a66f6930b..4a0e976ba4 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -638,7 +638,7 @@ string_to_handle(Str, Options, Bindings) when is_list(Str) ->
             case erl_scan:string(Str, 1, [text]) of
                 {ok, Tokens, _} ->
                     ScanRes =
-                        case lib:extended_parse_exprs(Tokens) of
+                        case erl_eval:extended_parse_exprs(Tokens) of
                             {ok, [Expr0], SBs} ->
                                 {ok, Expr0, SBs};
                             {ok, _ExprList, _SBs} ->
@@ -1196,8 +1196,8 @@ abstract1({table, TableDesc}, _NElements, _Depth, _A) ->
             {ok, Tokens, _} =
                 erl_scan:string(lists:flatten(TableDesc++"."), 1, [text]),
             {ok, Es, Bs} =
-                lib:extended_parse_exprs(Tokens),
-            [Expr] = lib:subst_values_for_vars(Es, Bs),
+                erl_eval:extended_parse_exprs(Tokens),
+            [Expr] = erl_eval:subst_values_for_vars(Es, Bs),
             special(Expr);
         false -> % abstract expression
             TableDesc
@@ -3749,7 +3749,7 @@ maybe_error_logger(Name, Why) ->
 	expand_stacktrace(),
     Trimmer = fun(M, _F, _A) -> M =:= erl_eval end,
     Formater = fun(Term, I) -> io_lib:print(Term, I, 80, -1) end,
-    X = lib:format_stacktrace(1, Stacktrace, Trimmer, Formater),
+    X = erl_error:format_stacktrace(1, Stacktrace, Trimmer, Formater),
     error_logger:Name("qlc: temporary file was needed for ~w\n~ts\n",
                       [Why, lists:flatten(X)]).
 
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index 1be37672e7..c73cf22943 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -230,7 +230,7 @@ server_loop(N0, Eval_0, Bs00, RT, Ds00, History0, Results0) ->
     {Res,Eval0} = get_command(Prompt, Eval_1, Bs0, RT, Ds0),
     case Res of 
 	{ok,Es0,XBs} ->
-            Es1 = lib:subst_values_for_vars(Es0, XBs),
+            Es1 = erl_eval:subst_values_for_vars(Es0, XBs),
             case expand_hist(Es1, N) of
                 {ok,Es} ->
                     {V,Eval,Bs,Ds} = shell_cmd(Es, Eval0, Bs0, RT, Ds0, cmd),
@@ -280,7 +280,7 @@ get_command(Prompt, Eval, Bs, RT, Ds) ->
                       io:scan_erl_exprs(group_leader(), Prompt, 1, [text])
                   of
                       {ok,Toks,_EndPos} ->
-                          lib:extended_parse_exprs(Toks);
+                          erl_eval:extended_parse_exprs(Toks);
                       {eof,_EndPos} ->
                           eof;
                       {error,ErrorInfo,_EndPos} ->
@@ -589,7 +589,7 @@ report_exception(Class, Severity, {Reason,Stacktrace}, RT) ->
     PF = fun(Term, I1) -> pp(Term, I1, RT) end,
     SF = fun(M, _F, _A) -> (M =:= erl_eval) or (M =:= ?MODULE) end,
     Enc = encoding(),
-    Str = lib:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
+    Str = erl_error:format_exception(I, Class, Reason, Stacktrace, SF, PF, Enc),
     io:requests([{put_chars, latin1, Tag},
                  {put_chars, unicode, Str},
                  nl]).
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index b3f3206d67..37c1f6bfd9 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -187,7 +187,7 @@ start_link(Host, Name, Args) ->
     start(Host, Name, Args, self()).
 
 start(Host0, Name, Args, LinkTo) ->
-    Prog = lib:progname(),
+    Prog = progname(),
     start(Host0, Name, Args, LinkTo, Prog).
 
 start(Host0, Name, Args, LinkTo, Prog) ->
@@ -296,7 +296,6 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 			     " -s slave slave_start ", node(),
 			     " ", Waiter,
 			     " ", Args]),
-	   
     case after_char($@, atom_to_list(node())) of
 	Host ->
 	    {ok, BasicCmd};
@@ -309,6 +308,15 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 	    end
     end.
 
+%% Return the name of the script that starts (this) erlang
+progname() ->
+    case init:get_argument(progname) of
+	{ok, [[Prog]]} ->
+	    Prog;
+	_Other ->
+	    "no_prog_name"
+    end.
+
 %% This is an attempt to distinguish between spaces in the program
 %% path and spaces that separate arguments. The program is quoted to
 %% allow spaces in the path.
@@ -317,7 +325,7 @@ mk_cmd(Host, Name, Args, Waiter, Prog0) ->
 %% (through start/5) or if the -program switch to beam is used and
 %% includes arguments (typically done by cerl in OTP test environment
 %% in order to ensure that slave/peer nodes are started with the same
-%% emulator and flags as the test node. The return from lib:progname()
+%% emulator and flags as the test node. The result from progname()
 %% could then typically be '/<full_path_to>/cerl -gcov').
 quote_progname(Progname) ->
     do_quote_progname(string:lexemes(to_list(Progname)," ")).
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 5fb48acfab..cd09872b87 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -2,7 +2,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2018. 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.
@@ -43,6 +43,7 @@
              erl_anno,
 	     erl_bits,
 	     erl_compile,
+	     erl_error,
 	     erl_eval,
              erl_expand_records,
 	     erl_internal,
@@ -71,7 +72,6 @@
 	     io_lib_format,
 	     io_lib_fread,
 	     io_lib_pretty,
-	     lib,
 	     lists,
 	     log_mf_h,
 	     maps,
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 9f48fbf5e3..13f2cbd27b 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1808,7 +1808,7 @@ rpc_call_max(Node, M, F, Args) ->
 
 %% Make sure that a bad specification for a printable range is rejected.
 bad_printable_range(Config) when is_list(Config) ->
-    Cmd = lists:concat([lib:progname()," +pcunnnnnicode -run erlang halt"]),
+    Cmd = ct:get_progname() ++ " +pcunnnnnicode -run erlang halt",
     P = open_port({spawn, Cmd}, [stderr_to_stdout, {line, 200}]),
     ok = receive
              {P, {data, {eol , "bad range of printable characters" ++ _}}} ->
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 8f8a0f6e73..5c189a6c73 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -7468,7 +7468,7 @@ strip_qlc_call(H) ->
 strip_qlc_call2(H) ->
     S = qlc:info(H, {flat, false}),
     {ok, Tokens, _EndLine} = erl_scan:string(S++".", 1, [text]),
-    {ok, [Expr], Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], Bs} = erl_eval:extended_parse_exprs(Tokens),
     {case Expr of
          {call,_,{remote,_,{atom,_,qlc},{atom,_,q}},[LC]} ->
              {qlc, lists:flatten([erl_pp:expr(LC), "."]), []};
@@ -7489,7 +7489,7 @@ strip_qlc_call2(H) ->
 join_info_count(H) ->
     S = qlc:info(H, {flat, false}),    
     {ok, Tokens, _EndLine} = erl_scan:string(S++".", 1, [text]),
-    {ok, [Expr], _Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], _Bs} = erl_eval:extended_parse_exprs(Tokens),
     #ji{nmerge = Nmerge, nlookup = Nlookup, 
         nkeysort = NKeysort, nnested_loop = Nnested_loop} = 
         ji(Expr, #ji{}),
@@ -7533,7 +7533,7 @@ lookup_keys({generate,_,Q}, L) ->
     lookup_keys(Q, L);
 lookup_keys({table,Chars}, L) when is_list(Chars) ->
     {ok, Tokens, _} = erl_scan:string(lists:flatten(Chars++"."), 1, [text]),
-    {ok, [Expr], _Bs} = lib:extended_parse_exprs(Tokens),
+    {ok, [Expr], _Bs} = erl_eval:extended_parse_exprs(Tokens),
     case Expr of
         {call,_,_,[_fun,AKs]} ->
             case erl_parse:normalise(AKs) of
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index ca85314775..22136d687c 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -2780,7 +2780,7 @@ otp_10302(Config) when is_list(Config) ->
     rpc:call(Node,shell, prompt_func, [default]),
     _ = shell:prompt_func(default),
 
-    %% Test lib:format_exception() (cf. OTP-6554)
+    %% Test erl_error:format_exception() (cf. OTP-6554)
     Test6 =
         <<"begin
                A = <<\"\\xaa\">>,
@@ -2967,10 +2967,10 @@ otp_14296(Config) when is_list(Config) ->
             R = t(S)
     end(),
 
-    %% Test lib:extended_parse_term/1
+    %% Test erl_eval:extended_parse_term/1
     TF = fun(S) ->
                  {ok, Ts, _} = erl_scan:string(S++".", 1, [text]),
-                 case lib:extended_parse_term(Ts) of
+                 case erl_eval:extended_parse_term(Ts) of
                      {ok, Term} -> Term;
                      {error, _}=Error -> Error
                  end
diff --git a/lib/tools/test/eprof_SUITE_data/eed.erl b/lib/tools/test/eprof_SUITE_data/eed.erl
index 5f2a21aa60..9fe49c6f5c 100644
--- a/lib/tools/test/eprof_SUITE_data/eed.erl
+++ b/lib/tools/test/eprof_SUITE_data/eed.erl
@@ -54,7 +54,7 @@ edit(Name) ->
 
 loop(St0) ->
     {ok, St1, Cmd} = get_line(St0),
-    case catch command(lib:nonl(Cmd), St1) of
+    case catch command(nonl(Cmd), St1) of
 	{'EXIT', Reason} ->
 	    %% XXX Should clear outstanding global command here.
 	    loop(print_error({'EXIT', Reason}, St1));
@@ -66,6 +66,10 @@ loop(St0) ->
 	    loop(St2)
     end.
 
+nonl([$\n]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 command(Cmd, St) ->
     case parse_command(Cmd, St) of
 	quit ->