[stdlib] Change default of erl_scan's unicode option

The value of the undocumented unicode option is very limited. The option
will most likely be removed completely soon.

1 files changed, 9 insertions, 6 deletions

diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index f4accde8e7..c9c3563d05 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -106,7 +106,7 @@
          ws          = false               :: boolean(),
          comment     = false               :: boolean(),
          text        = false               :: boolean(),
-         unicode     = false               :: boolean()}).
+         unicode     = true                :: boolean()}).
 
 %%----------------------------------------------------------------------------
 
@@ -349,14 +349,14 @@ string_thing(_) -> "string".
 %% erl_scan:string("[98,2730,99]."). This is to protect the caller
 %% from character codes greater than 255. Search for UNI to find code
 %% implementing this "feature". The 'unicode' option is undocumented
-%% and will probably be removed later.
+%% and will be removed later.
 -define(NO_UNICODE, 0).
 -define(UNI255(C), (C =< 16#ff)).
 
 options(Opts0) when is_list(Opts0) ->
     Opts = lists:foldr(fun expand_opt/2, [], Opts0),
-    [RW_fun] =
-        case opts(Opts, [reserved_word_fun], []) of
+    [RW_fun, Unicode] =
+        case opts(Opts, [reserved_word_fun, unicode], []) of
             badarg ->
                 erlang:error(badarg, [Opts0]);
             R ->
@@ -365,7 +365,6 @@ options(Opts0) when is_list(Opts0) ->
     Comment = proplists:get_bool(return_comments, Opts),
     WS = proplists:get_bool(return_white_spaces, Opts),
     Txt = proplists:get_bool(text, Opts),
-    Unicode = proplists:get_bool(unicode, Opts),
     #erl_scan{resword_fun = RW_fun,
               comment     = Comment,
               ws          = WS,
@@ -378,6 +377,8 @@ opts(Options, [Key|Keys], L) ->
     V = case lists:keyfind(Key, 1, Options) of
             {reserved_word_fun,F} when ?RESWORDFUN(F) ->
                 {ok,F};
+            {unicode, Bool} when is_boolean(Bool) ->
+                {ok,Bool};
             {Key,_} ->
                 badarg;
             false ->
@@ -393,7 +394,9 @@ opts(_Options, [], L) ->
     lists:reverse(L).
 
 default_option(reserved_word_fun) ->
-    fun reserved_word/1.
+    fun reserved_word/1;
+default_option(unicode) ->
+    true.
 
 expand_opt(return, Os) ->
     [return_comments,return_white_spaces|Os];