Merge branch 'maint'

* maint: (128 commits)
  beam_lib: Correct wrong type specification
  testSeqOf: Test constrained, extensible sizes
  [snmp/agent] Some restructuring of test suite
  Clean up testSeqOf
  Extend tests cases for BIT STRING
  Improve tests of ENUMERATED
  asn1ct_check: Eliminate useless Per argument from complist_as_tuple()
  asn1ct_check: Don't pass on #'ObjectClassFieldType'{} with fixed type
  asn1ct_gen_per: Remove useless renewal of 'enumval'
  Fix encoding of semi-constrained, extensible INTEGERs
  PER/UPER: Fix decoding of semi-constrained INTEGERs
  testPrim: Simplify test cases using a roundtrip function
  BER: Fix handling of a constructed default value for a class
  PER: Generate code for deep table constraints at compile-time
  Normalize data representation for table constraints
  asn1ct: Simplify check_value/2
  Extend tests to cover more code in asn1ct_check
  Clean up checking of values for ENUMERATEDs
  Introduce a new mechanism for structured error handling
  asn1_db: Make dbput/3 and dbsave/2 asynchronous
  ...

1 files changed, 42 insertions, 110 deletions

diff --git a/lib/asn1/src/asn1ct_name.erl b/lib/asn1/src/asn1ct_name.erl
index 3ab6f7b0ed..c0c2ed302c 100644
--- a/lib/asn1/src/asn1ct_name.erl
+++ b/lib/asn1/src/asn1ct_name.erl
@@ -21,13 +21,8 @@
 
 %%-compile(export_all).
 -export([start/0,
-	 stop/0,
-	 push/1,
-	 pop/1,
 	 curr/1,
 	 clear/0,
-	 delete/1,
-	 active/1,
 	 prev/1,
 	 next/1,
 	 all/1,
@@ -43,30 +38,19 @@ start() ->
                     end)),
             ok;
 	_Pid ->
-	    already_started
+	    %% Already started. Clear the variables.
+	    clear()
     end.
 
-stop() ->
-    req(stop),
-    erase(?MODULE).
-
 name_server_loop({Ref, Parent} = Monitor,Vars) ->
 %%    io:format("name -- ~w~n",[Vars]),
     receive
+	{_From,clear} ->
+	    name_server_loop(Monitor, []);
 	{From,{current,Variable}} ->
 	    From ! {?MODULE,get_curr(Vars,Variable)},
 	    name_server_loop(Monitor,Vars);
-	{From,{pop,Variable}} ->
-	    From ! {?MODULE,done},
-	    name_server_loop(Monitor,pop_var(Vars,Variable));
-	{From,{push,Variable}} ->
-	    From ! {?MODULE,done},
-	    name_server_loop(Monitor,push_var(Vars,Variable));
-	{From,{delete,Variable}} ->
-	    From ! {?MODULE,done},
-	    name_server_loop(Monitor,delete_var(Vars,Variable));
-	{From,{new,Variable}} ->
-	    From ! {?MODULE,done},
+	{_From,{new,Variable}} ->
 	    name_server_loop(Monitor,new_var(Vars,Variable));
 	{From,{prev,Variable}} ->
 	    From ! {?MODULE,get_prev(Vars,Variable)},
@@ -74,32 +58,29 @@ name_server_loop({Ref, Parent} = Monitor,Vars) ->
 	{From,{next,Variable}} ->
 	    From ! {?MODULE,get_next(Vars,Variable)},
 	    name_server_loop(Monitor,Vars);
-    {'DOWN', Ref, process, Parent, Reason} ->
-        exit(Reason);
-	{From,stop} ->
-	    From ! {?MODULE,stopped}
-    end.
-
-active(V) ->
-    case curr(V) of
-	nil -> false;
-	_ -> true
+	{'DOWN', Ref, process, Parent, Reason} ->
+	    exit(Reason)
     end.
 
 req(Req) ->
-    get(?MODULE) ! {self(), Req},
+    Pid = get(?MODULE),
+    Ref = monitor(process, Pid),
+    Pid ! {self(), Req},
     receive
-        {?MODULE, Reply} -> Reply
-    after 5000 ->
-            exit(name_server_timeout)
+        {?MODULE, Reply} ->
+	    Reply;
+	{'DOWN', Ref, process, Pid, Reason} ->
+            error({name_server_died,Reason})
     end.
 
-pop(V) ->     req({pop,V}).
-push(V) ->         req({push,V}).
-clear() ->     stop(), start().
+cast(Req) ->
+    get(?MODULE) ! {self(), Req},
+    ok.
+
+clear() ->     cast(clear).
 curr(V) ->     req({current,V}).
-new(V) ->      req({new,V}).
-delete(V) ->   req({delete,V}).
+new(V) ->      cast({new,V}).
+
 prev(V) ->
     case req({prev,V}) of
 	none ->
@@ -108,11 +89,7 @@ prev(V) ->
     end.
 
 next(V) ->
-    case req({next,V}) of
-	none ->
-	    exit('cant get next of none');
-	Rep -> Rep
-    end.
+    req({next,V}).
     
 all(V) ->
     Curr = curr(V),
@@ -146,81 +123,36 @@ get_digs([H|T]) ->
 	    []
     end.
 
-push_var(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
-	false ->
-	    [{Variable,[0]}|Vars];
-	{value,{Variable,[Digit|Drest]}} ->
-	    NewVars = lists:keydelete(Variable,1,Vars),
-	    [{Variable,[Digit,Digit|Drest]}|NewVars]
-    end.
-
-pop_var(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
-	false ->
-	    ok;
-	{value,{Variable,[_Dig]}} ->
-	    lists:keydelete(Variable,1,Vars);
-	{value,{Variable,[_Dig|Digits]}} ->
-	    NewVars = lists:keydelete(Variable,1,Vars),
-	    [{Variable,Digits}|NewVars]
-    end.
-    
-get_curr([],Variable) ->
+get_curr([], Variable) ->
     Variable;
-get_curr([{Variable,[0|_Drest]}|_Tail],Variable) ->
-    Variable;
-get_curr([{Variable,[Digit|_Drest]}|_Tail],Variable) ->
-    list_to_atom(lists:concat([Variable,integer_to_list(Digit)]));
-
-get_curr([_|Tail],Variable) ->
-    get_curr(Tail,Variable).
-
-new_var(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
-	false ->
-	    [{Variable,[1]}|Vars];
-	{value,{Variable,[Digit|Drest]}} ->
-	    NewVars = lists:keydelete(Variable,1,Vars),
-	    [{Variable,[Digit+1|Drest]}|NewVars]
-    end.
+get_curr([{Variable,Digit}|_Tail], Variable) ->
+    list_to_atom(lists:concat([Variable,Digit]));
+get_curr([_|Tail], Variable) ->
+    get_curr(Tail, Variable).
 
-delete_var(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
+new_var(Vars, Variable) ->
+    case lists:keyfind(Variable, 1, Vars) of
 	false ->
-	    Vars;
-	{value,{Variable,[N]}} when N =< 1  ->
-	    lists:keydelete(Variable,1,Vars);
-	{value,{Variable,[Digit|Drest]}} ->
-	    case Digit of
-		0 ->
-		    Vars;
-		_ ->
-		    NewVars = lists:keydelete(Variable,1,Vars),
-		    [{Variable,[Digit-1|Drest]}|NewVars]
-	    end
+	    [{Variable,1}|Vars];
+	{Variable,Digit} ->
+	    NewVars = lists:keydelete(Variable, 1, Vars),
+	    [{Variable,Digit+1}|NewVars]
     end.
 
-get_prev(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
+get_prev(Vars, Variable) ->
+    case lists:keyfind(Variable, 1, Vars) of
 	false ->
 	    none;
-	{value,{Variable,[Digit|_]}} when Digit =< 1 ->
+	{Variable,Digit} when Digit =< 1 ->
 	    Variable;
-	{value,{Variable,[Digit|_]}} when Digit > 1 ->
-	    list_to_atom(lists:concat([Variable,
-				       integer_to_list(Digit-1)]));
-	_ ->
-	    none
+	{Variable,Digit} when Digit > 1 ->
+	    list_to_atom(lists:concat([Variable,Digit-1]))
     end.
 
-get_next(Vars,Variable) ->
-    case lists:keysearch(Variable,1,Vars) of
+get_next(Vars, Variable) ->
+    case lists:keyfind(Variable, 1, Vars) of
 	false ->
 	    list_to_atom(lists:concat([Variable,"1"]));
-	{value,{Variable,[Digit|_]}} when Digit >= 0 ->
-	    list_to_atom(lists:concat([Variable,
-				       integer_to_list(Digit+1)]));
-	_ ->
-	    none
+	{Variable,Digit} when Digit >= 0 ->
+	    list_to_atom(lists:concat([Variable,Digit+1]))
     end.