dialyzer: Do not use deprecated functions in string(3)

3 files changed, 34 insertions, 38 deletions

diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 0617be6435..1e06d6e974 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -672,7 +672,7 @@ failed_anal_msg(Reason, LogCache) ->
 %%
 format_log_cache(LogCache) ->
   Str = lists:append(lists:reverse(LogCache)),
-  string:join(string:tokens(Str, "\n"), "\n  ").
+  lists:join("\n  ", string:lexemes(Str, "\n")).
 
 -spec store_warnings(#cl_state{}, [raw_warning()]) -> #cl_state{}.
 
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index 538327d4d1..dcbec32075 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -475,7 +475,7 @@ gui_loop(#gui_state{backend_pid = BackendPid, doc_plt = DocPlt,
       gui_loop(State);
     {BackendPid, ext_types, ExtTypes} ->
       Map = fun({M,F,A}) -> io_lib:format("~tp:~tp/~p",[M,F,A]) end,
-      ExtTypeString = string:join(lists:map(Map, ExtTypes), "\n"),
+      ExtTypeString = lists:join("\n", lists:map(Map, ExtTypes)),
       Msg = io_lib:format("The following remote types are being used "
 			  "but information about them is not available.\n"
 			  "The analysis might get more precise by including "
@@ -638,7 +638,7 @@ output_sms(#gui_state{frame = Frame}, Title, Message, Type) ->
 
 free_editor(#gui_state{gui = Wx, frame = Frame}, Title, Contents0) ->
   Contents = lists:flatten(Contents0),
-  Tokens = string:tokens(Contents, "\n"),
+  Tokens = string:lexemes(Contents, "\n"),
   NofLines = length(Tokens),
   LongestLine = lists:max([length(X) || X <- Tokens]),
   Height0 = NofLines * 25 + 80,
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index 7fe64c3e11..7602faa21d 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -1270,8 +1270,8 @@ filter_named_tables(NamesList) ->
     [] -> [];
     [Head|Tail] ->
       NewHead =
-        case string:rstr(Head, "()") of
-          0 -> [Head];
+        case string:find(Head, "()", trailing) of
+          nomatch -> [Head];
           _Other -> []
         end,
       NewHead ++ filter_named_tables(Tail)
@@ -1558,8 +1558,8 @@ any_args(StrList) ->
   case StrList of
     [] -> false;
     [Head|Tail] ->
-      case string:rstr(Head, "()") of
-        0 -> any_args(Tail);
+      case string:find(Head, "()", trailing) of
+        nomatch -> any_args(Tail);
         _Other -> true
       end
   end.
@@ -1765,10 +1765,8 @@ ets_list_args(MaybeList) ->
   end.
 
 ets_list_argtypes(ListStr) ->
-  ListStr1 = string:strip(ListStr, left, $[),
-  ListStr2 = string:strip(ListStr1, right, $]),
-  ListStr3 = string:strip(ListStr2, right, $.),
-  string:strip(ListStr3, right, $,).
+  ListStr1 = string:trim(ListStr, leading, "$["),
+  string:trim(ListStr1, trailing, "$]$.$,").
 
 ets_tuple_args(MaybeTuple) ->
   case is_tuple(MaybeTuple) of
@@ -1810,7 +1808,7 @@ ets_tuple_argtypes2_helper(TupleStr, ElemStr, NestingLevel) ->
             {[H|ElemStr], NestingLevel, false}
         end,
       case Return of
-        true -> string:tokens(NewElemStr, " |");
+        true -> string:lexemes(NewElemStr, " |");
         false ->
           ets_tuple_argtypes2_helper(T, NewElemStr, NewNestingLevel)
       end
@@ -1889,44 +1887,44 @@ format_args_2(StrArgList, Call) ->
   case Call of
     whereis ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     register ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     unregister ->
       lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |"));
+	string:lexemes(lists:nth(2, StrArgList), " |"));
     ets_new ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-	string:tokens(lists:nth(2, StrArgList), " |")),
+	string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
-        string:tokens(ets_list_argtypes(lists:nth(4, StrArgList1)), " |"));
+        string:lexemes(ets_list_argtypes(lists:nth(4, StrArgList1)), " |"));
     ets_lookup ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |")),
+        string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
-        string:tokens(lists:nth(4, StrArgList1), " |"));
+        string:lexemes(lists:nth(4, StrArgList1), " |"));
     ets_insert ->
       StrArgList1 = lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |")),
+        string:lexemes(lists:nth(2, StrArgList), " |")),
       lists_key_replace(4, StrArgList1,
         ets_tuple_argtypes2(
         ets_tuple_argtypes1(lists:nth(4, StrArgList1), [], [], 0),
         []));
     mnesia_dirty_read1 ->
       lists_key_replace(2, StrArgList,
-        [mnesia_tuple_argtypes(T) || T <- string:tokens(
+        [mnesia_tuple_argtypes(T) || T <- string:lexemes(
         lists:nth(2, StrArgList), " |")]);
     mnesia_dirty_read2 ->
       lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |"));
+        string:lexemes(lists:nth(2, StrArgList), " |"));
     mnesia_dirty_write1 ->
       lists_key_replace(2, StrArgList,
-        [mnesia_record_tab(R) || R <- string:tokens(
+        [mnesia_record_tab(R) || R <- string:lexemes(
         lists:nth(2, StrArgList), " |")]);
     mnesia_dirty_write2 ->
       lists_key_replace(2, StrArgList,
-        string:tokens(lists:nth(2, StrArgList), " |"));
+        string:lexemes(lists:nth(2, StrArgList), " |"));
     function_call -> StrArgList
   end.
 
@@ -1943,18 +1941,16 @@ format_type(Type, State) ->
   erl_types:t_to_string(Type, R).
 
 mnesia_record_tab(RecordStr) ->
-  case string:str(RecordStr, "#") =:= 1 of
-    true ->
-      "'" ++
-        string:sub_string(RecordStr, 2, string:str(RecordStr, "{") - 1) ++
-        "'";
-    false -> RecordStr
+  case erl_scan:string(RecordStr) of
+    {ok, [{'#', _}, {atom, _, Name}|_], _} ->
+      io_lib:write_string(atom_to_list(Name), $');
+    _ -> RecordStr
   end.
 
 mnesia_tuple_argtypes(TupleStr) ->
-  TupleStr1 = string:strip(TupleStr, left, ${),
-  [TupleStr2|_T] = string:tokens(TupleStr1, " ,"),
-  lists:flatten(string:tokens(TupleStr2, " |")).
+  TupleStr1 = string:trim(TupleStr, leading, "${"),
+  [TupleStr2|_T] = string:lexemes(TupleStr1, " ,"),
+  lists:flatten(string:lexemes(TupleStr2, " |")).
 
 -spec race_var_map(var_to_map1(), var_to_map2(), dict:dict(), op()) ->
         dict:dict().
@@ -2237,7 +2233,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
       case lists_key_member_lists(Vars, FunVarArgs) of
         0 -> [Vars, WVA2, WVA3, WVA4];
         N when is_integer(N) ->
-          NewWVA2 = string:tokens(lists:nth(N + 1, FunVarArgs), " |"),
+          NewWVA2 = string:lexemes(lists:nth(N + 1, FunVarArgs), " |"),
           [Vars, NewWVA2, WVA3, WVA4]
       end;
     ?WARN_WHEREIS_UNREGISTER ->
@@ -2246,7 +2242,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
       case lists_key_member_lists(Vars, FunVarArgs) of
         0 -> [Vars, WVA2];
         N when is_integer(N) ->
-          NewWVA2 = string:tokens(lists:nth(N + 1, FunVarArgs), " |"),
+          NewWVA2 = string:lexemes(lists:nth(N + 1, FunVarArgs), " |"),
           [Vars, NewWVA2]
       end;
     ?WARN_ETS_LOOKUP_INSERT ->
@@ -2256,7 +2252,7 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
         case lists_key_member_lists(Vars1, FunVarArgs) of
           0 -> [Vars1, WVA2];
           N1 when is_integer(N1) ->
-            NewWVA2 = string:tokens(lists:nth(N1 + 1, FunVarArgs), " |"),
+            NewWVA2 = string:lexemes(lists:nth(N1 + 1, FunVarArgs), " |"),
             [Vars1, NewWVA2]
         end,
       Vars2 =
@@ -2286,10 +2282,10 @@ var_type_analysis(FunDefArgs, FunCallTypes, WarnVarArgs, RaceWarnTag,
           NewWVA2 =
             case Arity of
               1 ->
-                [mnesia_record_tab(R) || R <- string:tokens(
+                [mnesia_record_tab(R) || R <- string:lexemes(
                   lists:nth(2, FunVarArgs), " |")];
               2 ->
-                string:tokens(lists:nth(N + 1, FunVarArgs), " |")
+                string:lexemes(lists:nth(N + 1, FunVarArgs), " |")
             end,
           [Vars, NewWVA2|T]
       end