asn1: Remove deprecated functions

Remove the entire asn1rt module. All functions in it were deprecated in
OTP 17.

In asn1ct, remove the deprecated functions asn1ct:encode/3 and
asn1ct:decode/3. Also remove asn1ct:encode/2, which has not been
formally deprecated but is undocumented.

5 files changed, 6 insertions, 211 deletions

diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 38cf2d496a..ba459f6cd3 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -68,7 +68,6 @@ CT_MODULES= \
 	$(EVAL_CT_MODULES)
 
 RT_MODULES= \
-	asn1rt \
 	asn1rt_nif
 
 MODULES= $(CT_MODULES) $(RT_MODULES) 
diff --git a/lib/asn1/src/asn1.app.src b/lib/asn1/src/asn1.app.src
index 1f8805ff5e..d2da727193 100644
--- a/lib/asn1/src/asn1.app.src
+++ b/lib/asn1/src/asn1.app.src
@@ -2,7 +2,6 @@
  [{description, "The Erlang ASN1 compiler version %VSN%"},
   {vsn, "%VSN%"},
   {modules, [
-	asn1rt,
         asn1rt_nif
              ]},
   {registered, [
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 8783b5418d..4e030861f5 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -20,17 +20,12 @@
 %%
 %%
 -module(asn1ct).
--deprecated([decode/3,encode/3]).
--compile([{nowarn_deprecated_function,{asn1rt,decode,3}},
-	  {nowarn_deprecated_function,{asn1rt,encode,2}},
-	  {nowarn_deprecated_function,{asn1rt,encode,3}}]).
 
 %% Compile Time functions for ASN.1 (e.g ASN.1 compiler).
 
 %%-compile(export_all).
 %% Public exports
 -export([compile/1, compile/2]).
--export([encode/2, encode/3, decode/3]).
 -export([test/1, test/2, test/3, value/2, value/3]).
 %% Application internal exports
 -export([compile_asn/3,compile_asn1/3,compile_py/3,compile/3,
@@ -1271,21 +1266,6 @@ pretty2(Module,AbsFile) ->
 start(Includes) when is_list(Includes) ->
     asn1_db:dbstart(Includes).
 
-
-encode(Module,Term) ->
-    asn1rt:encode(Module,Term).
-
-encode(Module,Type,Term) when is_list(Module) ->
-    asn1rt:encode(list_to_atom(Module),Type,Term);
-encode(Module,Type,Term) ->
-    asn1rt:encode(Module,Type,Term).
-
-decode(Module,Type,Bytes) when is_list(Module) ->
-    asn1rt:decode(list_to_atom(Module),Type,Bytes);
-decode(Module,Type,Bytes) ->
-    asn1rt:decode(Module,Type,Bytes).
-
-
 test(Module)                             -> test_module(Module, []).
 
 test(Module, [] = Options)               -> test_module(Module, Options);
@@ -1330,10 +1310,10 @@ test_type(Module, Type) ->
 
 test_value(Module, Type, Value) ->
     in_process(fun() ->
-                   case catch encode(Module, Type, Value) of
+                   case catch Module:encode(Type, Value) of
                        {ok, Bytes} ->
                            NewBytes = prepare_bytes(Bytes),
-                           case decode(Module, Type, NewBytes) of
+                           case Module:decode(Type, NewBytes) of
                                {ok, Value} ->
                                    {ok, {Module, Type, Value}};
                                {ok, Res}   ->
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index 57cd3f8af6..b3d41dd9f3 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -19,7 +19,6 @@
 %%
 %%
 -module(asn1ct_value).
--compile([{nowarn_deprecated_function,{asn1rt,utf8_list_to_binary,1}}]).
 
 %%  Generate Erlang values for ASN.1 types.
 %%  The value is randomized within it's constraints
@@ -292,8 +291,10 @@ from_type_prim(M, D) ->
 	'BMPString' ->
 	    adjust_list(size_random(C),c_string(C,"BMPString"));
 	'UTF8String' ->
-	    {ok,Res}=asn1rt:utf8_list_to_binary(adjust_list(random(50),[$U,$T,$F,$8,$S,$t,$r,$i,$n,$g,16#ffff,16#fffffff,16#ffffff,16#fffff,16#fff])),
-	    Res;
+            L = adjust_list(random(50),
+                            [$U,$T,$F,$8,$S,$t,$r,$i,$n,$g,
+                             16#ffff,16#ffee,16#10ffff,16#ffff,16#fff]),
+	    unicode:characters_to_binary(L);
 	'UniversalString' ->
 	    adjust_list(size_random(C),c_string(C,"UniversalString"));
 	XX ->
diff --git a/lib/asn1/src/asn1rt.erl b/lib/asn1/src/asn1rt.erl
deleted file mode 100644
index 3e09ce2252..0000000000
--- a/lib/asn1/src/asn1rt.erl
+++ /dev/null
@@ -1,184 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1997-2016. 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.
-%% 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.
-%% 
-%% %CopyrightEnd%
-%%
-%%
--module(asn1rt).
--deprecated(module).
-
-%% Runtime functions for ASN.1 (i.e encode, decode)
-
--export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/1]).
-
--export([utf8_binary_to_list/1,utf8_list_to_binary/1]).
-
-encode(Module,{Type,Term}) ->
-    encode(Module,Type,Term).
-
-encode(Module,Type,Term) ->
-    case catch apply(Module,encode,[Type,Term]) of
-	{'EXIT',undef} ->
-	    {error,{asn1,{undef,Module,Type}}};
-	Result ->
-	    Result
-    end.
-
-decode(Module,Type,Bytes) ->
-    case catch apply(Module,decode,[Type,Bytes]) of
-	{'EXIT',undef} ->
-	    {error,{asn1,{undef,Module,Type}}};
-	Result ->
-	    Result
-    end.
-
-%% Remove in R16A
-load_driver() ->
-    ok.
-
-unload_driver() ->
-    ok.
-
-info(Module) ->
-    case catch apply(Module,info,[]) of
-	{'EXIT',{undef,_Reason}} ->
-	    {error,{asn1,{undef,Module,info}}};
-	Result ->
-	    {ok,Result}
-    end.
-
-%% utf8_binary_to_list/1 transforms a utf8 encoded binary to a list of
-%% unicode elements, where each element is the unicode integer value
-%% of a utf8 character.
-%% Bin is a utf8 encoded value. The return value is either {ok,Val} or
-%% {error,Reason}. Val is a list of integers, where each integer is a
-%% unicode character value.
-utf8_binary_to_list(Bin) when is_binary(Bin) ->
-    utf8_binary_to_list(Bin,[]).
-
-utf8_binary_to_list(<<>>,Acc) ->
-    {ok,lists:reverse(Acc)};
-utf8_binary_to_list(Bin,Acc) ->
-    Len = utf8_binary_len(Bin),
-    case catch split_binary(Bin,Len) of
-	{CharBin,RestBin} -> 
-	    case utf8_binary_char(CharBin) of
-		C when is_integer(C) -> 
-		    utf8_binary_to_list(RestBin,[C|Acc]);
-		Err -> Err
-	    end;
-	Err -> {error,{asn1,{bad_encoded_utf8string,Err}}}
-    end.
-	    
-utf8_binary_len(<<0:1,_:7,_/binary>>) ->
-    1;
-utf8_binary_len(<<1:1,1:1,0:1,_:5,_/binary>>) ->
-    2;
-utf8_binary_len(<<1:1,1:1,1:1,0:1,_:4,_/binary>>) ->
-    3;
-utf8_binary_len(<<1:1,1:1,1:1,1:1,0:1,_:3,_/binary>>) ->
-    4;
-utf8_binary_len(<<1:1,1:1,1:1,1:1,1:1,0:1,_:2,_/binary>>) ->
-    5;
-utf8_binary_len(<<1:1,1:1,1:1,1:1,1:1,1:1,0:1,_:1,_/binary>>) ->
-    6;
-utf8_binary_len(Bin) ->
-    {error,{asn1,{bad_utf8_length,Bin}}}.
-
-utf8_binary_char(<<0:1,Int:7>>) ->
-    Int;
-utf8_binary_char(<<_:2,0:1,Int1:5,1:1,0:1,Int2:6>>) ->
-    (Int1 bsl 6) bor Int2;
-utf8_binary_char(<<_:3,0:1,Int1:4,1:1,0:1,Int2:6,1:1,0:1,Int3:6>>) ->
-    <<Res:16>> = <<Int1:4,Int2:6,Int3:6>>,
-    Res;
-utf8_binary_char(<<_:4,0:1,Int1:3,Rest/binary>>) ->
-    <<1:1,0:1,Int2:6,1:1,0:1,Int3:6,1:1,0:1,Int4:6>> = Rest,
-    <<Res:24>> = <<0:3,Int1:3,Int2:6,Int3:6,Int4:6>>,
-    Res;
-utf8_binary_char(<<_:5,0:1,Int1:2,Rest/binary>>) ->
-    <<1:1,0:1,Int2:6,1:1,0:1,Int3:6,1:1,0:1,Int4:6,1:1,0:1,Int5:6>> = Rest,
-    <<Res:32>> = <<0:6,Int1:2,Int2:6,Int3:6,Int4:6,Int5:6>>,
-    Res;
-utf8_binary_char(<<_:6,0:1,I:1,Rest/binary>>) ->
-    <<1:1,0:1,Int2:6,1:1,0:1,Int3:6,1:1,0:1,Int4:6,1:1,0:1,
-     Int5:6,1:1,0:1,Int6:6>> = Rest,
-    <<Res:32>> = <<0:1,I:1,Int2:6,Int3:6,Int4:6,Int5:6,Int6:6>>,
-    Res;
-utf8_binary_char(Err) ->
-    {error,{asn1,{bad_utf8_character_encoding,Err}}}.
-
-
-%% macros used for utf8 encoding
--define(bit1to6_into_utf8byte(I),16#80 bor (I band 16#3f)).
--define(bit7to12_into_utf8byte(I),16#80 bor ((I band 16#fc0) bsr 6)).
--define(bit13to18_into_utf8byte(I),16#80 bor ((I band 16#3f000) bsr 12)).
--define(bit19to24_into_utf8byte(I),16#80 bor ((Int band 16#fc0000) bsr 18)).
--define(bit25to30_into_utf8byte(I),16#80 bor ((Int band 16#3f000000) bsr 24)).
-
-%% utf8_list_to_binary/1 transforms a list of integers to a
-%% binary. Each element in the input list has the unicode (integer)
-%% value of an utf8 character. 
-%% The return value is either {ok,Bin} or {error,Reason}. The
-%% resulting binary is utf8 encoded.
-utf8_list_to_binary(List) ->
-    utf8_list_to_binary(List,[]).
-
-utf8_list_to_binary([],Acc) when is_list(Acc) ->
-    {ok,list_to_binary(lists:reverse(Acc))};
-utf8_list_to_binary([],Acc) ->
-    {error,{asn1,Acc}};
-utf8_list_to_binary([H|T],Acc) ->
-    case catch utf8_encode(H,Acc) of
-	NewAcc when is_list(NewAcc) -> 
-	    utf8_list_to_binary(T,NewAcc);
-	Err -> Err
-    end.
-
-
-utf8_encode(Int,Acc) when Int < 128 ->
-    %% range 16#00000000 - 16#0000007f
-    %% utf8 encoding: 0xxxxxxx
-    [Int|Acc];
-utf8_encode(Int,Acc) when Int < 16#800 ->
-    %% range 16#00000080 - 16#000007ff
-    %% utf8 encoding: 110xxxxx 10xxxxxx
-    [?bit1to6_into_utf8byte(Int),16#c0 bor (Int bsr 6)|Acc];
-utf8_encode(Int,Acc) when Int < 16#10000 ->
-    %% range 16#00000800 - 16#0000ffff
-    %% utf8 encoding: 1110xxxx 10xxxxxx 10xxxxxx
-    [?bit1to6_into_utf8byte(Int),?bit7to12_into_utf8byte(Int),
-     16#e0 bor ((Int band 16#f000) bsr 12)|Acc];
-utf8_encode(Int,Acc) when Int < 16#200000 ->
-    %% range 16#00010000 - 16#001fffff
-    %% utf8 encoding: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-    [?bit1to6_into_utf8byte(Int),?bit7to12_into_utf8byte(Int),
-     ?bit13to18_into_utf8byte(Int),
-     16#f0 bor ((Int band 16#1c0000) bsr 18)|Acc];
-utf8_encode(Int,Acc) when Int < 16#4000000 ->
-    %% range 16#00200000 - 16#03ffffff
-    %% utf8 encoding: 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-    [?bit1to6_into_utf8byte(Int),?bit7to12_into_utf8byte(Int),
-     ?bit13to18_into_utf8byte(Int),?bit19to24_into_utf8byte(Int),
-     16#f8 bor ((Int band 16#3000000) bsr 24)|Acc];
-utf8_encode(Int,Acc) ->
-    %% range 16#04000000 - 16#7fffffff
-    %% utf8 encoding: 1111110x 10xxxxxx ...(total 6 bytes) 10xxxxxx
-    [?bit1to6_into_utf8byte(Int),?bit7to12_into_utf8byte(Int),
-     ?bit13to18_into_utf8byte(Int),?bit19to24_into_utf8byte(Int),
-     ?bit25to30_into_utf8byte(Int),
-     16#fc bor ((Int band 16#40000000) bsr 30)|Acc].