Merge branch 'hb/prepare_for_unicode/OTP-10630'

* hb/prepare_for_unicode/OTP-10630:
  Prepare OTP files for Unicode as default encoding

1 files changed, 13 insertions, 12 deletions

diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index 20eb341c31..e5bb287c45 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,3 +1,4 @@
+%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -32,19 +33,19 @@
 %% 173 - 176    { - ~           punctuation
 %% 177          DEL             control
 %% 200 - 237                    control
-%% 240 - 277    NBSP - �        punctuation
-%% 300 - 326    � - �           uppercase
-%% 327          �               punctuation
-%% 330 - 336    � - �           uppercase
-%% 337 - 366    � - �           lowercase
-%% 367          �               punctuation
-%% 370 - 377    � - �           lowercase
+%% 240 - 277    NBSP - ¿        punctuation
+%% 300 - 326    À - Ö           uppercase
+%% 327          ×               punctuation
+%% 330 - 336    Ø - Þ           uppercase
+%% 337 - 366    ß - ö           lowercase
+%% 367          ÷               punctuation
+%% 370 - 377    ø - ÿ           lowercase
 %%
 %% Many punctuation characters have special meaning:
 %%  $\s, $_, $", $$, $%, $', $.
 %% DEL is a punctuation.
 %%
-%% Must watch using � \327, very close to x \170.
+%% Must watch using × \327, very close to x \170.
 
 -module(erl_scan).
 
@@ -535,9 +536,9 @@ scan1([$$|Cs], St, Line, Col, Toks) ->
     scan_char(Cs, St, Line, Col, Toks);
 scan1([$\r|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
     white_space_end(Cs, St, Line, Col, Toks, 1, "\r");
-scan1([C|Cs], St, Line, Col, Toks) when C >= $�, C =< $�, C =/= $� ->
+scan1([C|Cs], St, Line, Col, Toks) when C >= $ß, C =< $ÿ, C =/= $÷ ->
     scan_atom(Cs, St, Line, Col, Toks, [C]);
-scan1([C|Cs], St, Line, Col, Toks) when C >= $�, C =< $�, C /= $� ->
+scan1([C|Cs], St, Line, Col, Toks) when C >= $À, C =< $Þ, C /= $× ->
     scan_variable(Cs, St, Line, Col, Toks, [C]);
 scan1([$\t|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
     scan_tabs(Cs, St, Line, Col, Toks, 1);
@@ -704,9 +705,9 @@ scan_name([C|Cs], Ncs) when ?DIGIT(C) ->
     scan_name(Cs, [C|Ncs]);
 scan_name([$@=C|Cs], Ncs) ->
     scan_name(Cs, [C|Ncs]);
-scan_name([C|Cs], Ncs) when C >= $�, C =< $�, C =/= $� ->
+scan_name([C|Cs], Ncs) when C >= $ß, C =< $ÿ, C =/= $÷ ->
     scan_name(Cs, [C|Ncs]);
-scan_name([C|Cs], Ncs) when C >= $�, C =< $�, C =/= $� ->
+scan_name([C|Cs], Ncs) when C >= $À, C =< $Þ, C =/= $× ->
     scan_name(Cs, [C|Ncs]);
 scan_name([], Ncs) ->
     {more,Ncs};