Introduce a new mechanism for structured error handling

3 files changed, 78 insertions, 4 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 6e6ab4639c..15b97df972 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -114,7 +114,8 @@ MODULES= \
 	asn1_app_test \
 	asn1_appup_test \
 	asn1_wrapper \
-	asn1_SUITE
+	asn1_SUITE \
+	error_SUITE
 
 SUITE= asn1_SUITE.erl
 
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index 5ec201fd78..2b3ff07980 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -860,7 +860,7 @@ testInvokeMod(Config, Rule, Opts) ->
     {ok, _Result2} = 'PrimStrings':encode('Bs1', [1, 0, 1, 0]).
 
 testExport(Config) ->
-    {error, {asn1, _Reason}} =
+    {error, _} =
 	asn1ct:compile(filename:join(?config(data_dir, Config),
 				     "IllegalExport"),
 		       [{outdir, ?config(case_dir, Config)}]).
@@ -906,8 +906,8 @@ testOpenTypeImplicitTag(Config, Rule, Opts) ->
 duplicate_tags(Config) ->
     DataDir = ?config(data_dir, Config),
     CaseDir = ?config(case_dir, Config),
-    {error, {asn1, [{error, {type, _, _, 'SeqOpt1Imp',
-			     {asn1, {duplicates_of_the_tags, _}}}}]}} =
+    {error, [{error, {type, _, _, 'SeqOpt1Imp',
+			     {asn1, {duplicates_of_the_tags, _}}}}]} =
 	asn1ct:compile(filename:join(DataDir, "SeqOptional2"),
 		       [abs, {outdir, CaseDir}]).
 
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
new file mode 100644
index 0000000000..4dd4d58aad
--- /dev/null
+++ b/lib/asn1/test/error_SUITE.erl
@@ -0,0 +1,73 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(error_SUITE).
+-export([suite/0,all/0,groups/0,
+	 already_defined/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+suite() -> [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [{group,p}].
+
+groups() ->
+    [{p,parallel(),[already_defined]}].
+
+parallel() ->
+    case erlang:system_info(schedulers) > 1 of
+        true  -> [parallel];
+        false -> []
+    end.
+
+already_defined(Config) ->
+    M = 'Already',
+    P = {M,
+	 <<"Already DEFINITIONS ::= BEGIN\n"
+	   "  I ::= INTEGER\n"
+	   "  i I ::= 42\n"
+	   "  I ::= OCTET STRING\n"
+	   "  I ::= CLASS { &Type }\n"
+	   "  MYCLASS ::= CLASS { &Type }\n"
+	   "  i MYCLASS ::= { &Type INTEGER }\n"
+	   "  o MYCLASS ::= { &Type INTEGER }\n"
+	   "  I MYCLASS ::= { o }\n"
+	   "  I{T} ::= SEQUENCE OF T\n"
+	   "  I{INTEGER:x} INTEGER ::= { 1 | 2 | x }\n"
+	   "  i{T} MYCLASS ::= { &Type T }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{M,4},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,5},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,7},asn1ct_check,{already_defined,'i',3}},
+      {structured_error,{M,9},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,10},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,11},asn1ct_check,{already_defined,'I',2}},
+      {structured_error,{M,12},asn1ct_check,{already_defined,'i',3}}
+     ]
+    } = run(P, Config),
+    ok.
+
+run({Mod,Spec}, Config) ->
+    Base = atom_to_list(Mod) ++ ".asn1",
+    File = filename:join(?config(priv_dir, Config), Base),
+    ok = file:write_file(File, Spec),
+    asn1ct:compile(File).