From 5860e1e560123698a2ede2b4d93f9e4460dded9c Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 21 Jul 2011 16:48:27 +0200
Subject: Code cleanup, unduplicate test for whitespace

---
 lib/stdlib/src/io_lib_fread.erl | 52 +++++++++++++----------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 411d293876..ded1346097 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -24,6 +24,10 @@
 
 -import(lists, [reverse/1,reverse/2]).
 
+-define(is_whitespace(C),
+	((C) =:= $\s orelse (C) =:= $\t
+	 orelse (C) =:= $\r orelse (C) =:= $\n)).
+
 %%-----------------------------------------------------------------------
 
 %% fread(Continuation, CharList, FormatString)
@@ -106,16 +110,10 @@ fread_line(Format0, Line, N0, Results0, More, Newline) ->
 fread(Format, Line) ->
     fread(Format, Line, 0, []).
 
-fread([$~|Format0], Line, N, Results) ->
+fread([$~|Format0]=AllFormat, Line, N, Results) ->
     {Format,F,Sup,Unicode} = fread_field(Format0),
-    fread1(Format, F, Sup, Unicode, Line, N, Results, Format0);
-fread([$\s|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\t|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\r|Format], Line, N, Results) ->
-    fread_skip_white(Format, Line, N, Results);
-fread([$\n|Format], Line, N, Results) ->
+    fread1(Format, F, Sup, Unicode, Line, N, Results, AllFormat);
+fread([C|Format], Line, N, Results) when ?is_whitespace(C) ->
     fread_skip_white(Format, Line, N, Results);
 fread([C|Format], [C|Line], N, Results) ->
     fread(Format, Line, N+1, Results);
@@ -132,13 +130,7 @@ fread([_|_], eof, _N, _Results) ->
 fread([], Line, _N, Results) ->
     {ok,reverse(Results),Line}.
 
-fread_skip_white(Format, [$\s|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\t|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\r|Line], N, Results) ->
-    fread_skip_white(Format, Line, N+1, Results);
-fread_skip_white(Format, [$\n|Line], N, Results) ->
+fread_skip_white(Format, [C|Line], N, Results) when ?is_whitespace(C) ->
     fread_skip_white(Format, Line, N+1, Results);
 fread_skip_white(Format, Line, N, Results) ->
     fread(Format, Line, N, Results).
@@ -174,7 +166,7 @@ fread1([$l|Format], _F, Sup, _U, Line, N, Res, _AllFormat) ->
     fread(Format, Line, N, fread_result(Sup, N, Res));
 fread1(_Format, _F, _Sup, _U, [], N, Res, AllFormat) ->
     %% Need more input here.
-    {more,[$~|AllFormat],N,Res};
+    {more,AllFormat,N,Res};
 fread1(_Format, _F, _Sup, _U, eof, 0, [], _AllFormat) ->
     %% This is at start of input so no error.
     eof;
@@ -394,26 +386,16 @@ fread_string_cs(Line0, N0, true) ->
 %% fread_digits(Line, N, Base, Characters)
 %%  Read segments of things, return "thing" characters in reverse order.
 
-fread_skip_white([$\s|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\t|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\r|Line]) -> fread_skip_white(Line);
-fread_skip_white([$\n|Line]) -> fread_skip_white(Line);
+fread_skip_white([C|Line]) when ?is_whitespace(C) ->
+    fread_skip_white(Line);
 fread_skip_white(Line) -> Line.
 
-fread_skip_white([$\s|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\t|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\r|Line], N) ->
-    fread_skip_white(Line, N+1);
-fread_skip_white([$\n|Line], N) ->
+fread_skip_white([C|Line], N) when ?is_whitespace(C) ->
     fread_skip_white(Line, N+1);
 fread_skip_white(Line, N) -> {Line,N}.
 
-fread_skip_latin1_nonwhite([$\s|Line], N, Cs) -> {[$\s|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\t|Line], N, Cs) -> {[$\t|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\r|Line], N, Cs) -> {[$\r|Line],N,Cs};
-fread_skip_latin1_nonwhite([$\n|Line], N, Cs) -> {[$\n|Line],N,Cs};
+fread_skip_latin1_nonwhite([C|Line], N, Cs) when ?is_whitespace(C) ->
+    {[C|Line],N,Cs};
 fread_skip_latin1_nonwhite([C|Line], N, []) when C > 255 ->
     {[C|Line],N,error};
 fread_skip_latin1_nonwhite([C|Line], N, Cs) when C > 255 ->
@@ -422,10 +404,8 @@ fread_skip_latin1_nonwhite([C|Line], N, Cs) ->
     fread_skip_latin1_nonwhite(Line, N+1, [C|Cs]);
 fread_skip_latin1_nonwhite([], N, Cs) -> {[],N,Cs}.
 
-fread_skip_nonwhite([$\s|Line], N, Cs) -> {[$\s|Line],N,Cs};
-fread_skip_nonwhite([$\t|Line], N, Cs) -> {[$\t|Line],N,Cs};
-fread_skip_nonwhite([$\r|Line], N, Cs) -> {[$\r|Line],N,Cs};
-fread_skip_nonwhite([$\n|Line], N, Cs) -> {[$\n|Line],N,Cs};
+fread_skip_nonwhite([C|Line], N, Cs) when ?is_whitespace(C) ->
+    {[C|Line],N,Cs};
 fread_skip_nonwhite([C|Line], N, Cs) ->
     fread_skip_nonwhite(Line, N+1, [C|Cs]);
 fread_skip_nonwhite([], N, Cs) -> {[],N,Cs}.
-- 
cgit v1.2.3